| commit | f5528001f69abbf1440eb39a6c895c133b52dd9a | [log] [tgz] |
|---|---|---|
| author | omar <omarcornut@gmail.com> | Mon Jan 27 14:57:00 2020 +0100 |
| committer | omar <omarcornut@gmail.com> | Mon Jan 27 14:57:00 2020 +0100 |
| tree | 4d3918e16f29ebbbbb792435fd1049f71883757c | |
| parent | f68075b333b017520e2d98a5c9901f04b3c2745c [diff] | |
| parent | 4d4e3b97f4c9950ccb92986c8f201b2923a8ec61 [diff] |
Merge branch 'master' into docking # Conflicts: # examples/imgui_impl_glfw.cpp # examples/imgui_impl_opengl2.cpp # imgui.cpp # imgui_internal.h