| commit | 66e08b6575a385b68fd6ebf42f1a59aa529fee80 | [log] [tgz] |
|---|---|---|
| author | ocornut <omar@miracleworld.net> | Wed Jan 14 19:42:11 2026 +0100 |
| committer | ocornut <omar@miracleworld.net> | Wed Jan 14 19:42:11 2026 +0100 |
| tree | d49b35cf75551a23116a4c951f13a274201493b9 | |
| parent | 84a9d532b6f635a6017b90e65b627c36fd1afd20 [diff] | |
| parent | 9a6eb0ab2564925aac1bd1d9a7a3b3619192ca57 [diff] |
Merge branch 'master' into docking (require next commit) # Conflicts: # backends/imgui_impl_glfw.cpp # backends/imgui_impl_glfw.h # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_vulkan.h # backends/imgui_impl_win32.cpp # imgui.cpp