| commit | 8567a4cca3155b3ba7aaefb5c70fa432c00c2b5a | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Mon Jan 17 18:16:55 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Mon Jan 17 18:19:20 2022 +0100 |
| tree | cfb204423a25eee2073946d0d31076767f61bee0 | |
| parent | ec1e57ed4a616ee42f4711b4a955bc68b9c1f463 [diff] | |
| parent | 90a6961638e3a7244d89969390427e5d94e856f1 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_win32.cpp # imgui_demo.cpp # imgui_internal.h