| commit | df65d4a14f9f5a15eea8a7ae03e3d26f32f7e5d4 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Tue Sep 11 11:18:46 2018 +0200 |
| committer | omar <omarcornut@gmail.com> | Tue Sep 11 11:18:46 2018 +0200 |
| tree | 05958fc7df7a695a51bba4f587770ff5eb3d9ac1 | |
| parent | b974fffea033149ffe53b4107f632b4ebb95b708 [diff] | |
| parent | d014d0285a74e6749ffbb5acc403686e3a267cd8 [diff] |
Merge branch 'master' into viewport # Conflicts: # imgui.cpp # imgui_internal.h