| commit | 3e0d6ec895483e33a663d3cfc1c58f1cafbe978c | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Fri Jan 21 12:39:15 2022 +0100 |
| committer | ocornut <omarcornut@gmail.com> | Fri Jan 21 12:39:15 2022 +0100 |
| tree | 4e3b120b804b9221e14b873654ae0b987e487186 | |
| parent | e278277d53c961b6b345388b79644187bd0d0339 [diff] | |
| parent | 62d6be3747924552ebb66046af6d9ebbc4ab0eae [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_sdl.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # imgui.cpp # imgui.h # imgui_demo.cpp # imgui_internal.h