| commit | f8f805f04631323c8a75accc009eb9701f5ca027 | [log] [tgz] |
|---|---|---|
| author | ocornut <omarcornut@gmail.com> | Thu Jul 20 23:18:47 2023 +0200 |
| committer | ocornut <omarcornut@gmail.com> | Thu Jul 20 23:18:47 2023 +0200 |
| tree | fdf23d69713397f52a918d58aa84a6cd875e1965 | |
| parent | 07d1709ca2759ab78a19c26c141a99cf8080b2a9 [diff] | |
| parent | 1109de38277fd2d14d4dca4c1cb8d4a2c4ff0f95 [diff] |
Merge branch 'master' into docking # Conflicts: # backends/imgui_impl_dx10.cpp # backends/imgui_impl_dx11.cpp # backends/imgui_impl_dx12.cpp # backends/imgui_impl_dx9.cpp # backends/imgui_impl_glfw.cpp # backends/imgui_impl_opengl2.cpp # backends/imgui_impl_opengl3.cpp # backends/imgui_impl_osx.mm # backends/imgui_impl_sdl2.cpp # backends/imgui_impl_sdl3.cpp # backends/imgui_impl_vulkan.cpp # backends/imgui_impl_win32.cpp