| commit | 992736dc5d4e80fa1f93bdd4969cf2145d604bf5 | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Fri Dec 13 17:06:27 2019 +0100 |
| committer | omar <omarcornut@gmail.com> | Fri Dec 13 17:06:27 2019 +0100 |
| tree | 25b464ac19cfe437255d93c899b2b39f0c5605ad | |
| parent | 927580d4a86acd1e131d20627d3cb42a13a969c3 [diff] | |
| parent | 3a800f2dc9f1be1aac4c1148983b80556d6ce727 [diff] |
Merge branch 'refs/heads/master' into docking # Conflicts: # docs/CHANGELOG.txt # examples/imgui_impl_glfw.cpp # examples/imgui_impl_sdl.cpp # examples/imgui_impl_win32.cpp # imgui.cpp # imgui_internal.h # imgui_widgets.cpp