Merge branch 'master' into docking

# Conflicts: # backends/imgui_impl_vulkan.cpp # imgui_internal.h
2026-11-10 19:03:30 +00:00 · 2023-12-05 12:20:16 +01:00 · 2023-12-05 12:20:16 +01:00 · 96b5b1724b
commit 96b5b1724b
parent f6253b87d0 1fd5ff7152
12 changed files with 111 additions and 39 deletions
--- a/backends/imgui_impl_android.cpp
+++ b/backends/imgui_impl_android.cpp
--- a/backends/imgui_impl_sdl3.cpp
+++ b/backends/imgui_impl_sdl3.cpp
--- a/backends/imgui_impl_vulkan.cpp
+++ b/backends/imgui_impl_vulkan.cpp
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
--- a/examples/example_sdl3_sdlrenderer3/main.cpp
+++ b/examples/example_sdl3_sdlrenderer3/main.cpp
--- a/examples/example_win32_opengl3/main.cpp
+++ b/examples/example_win32_opengl3/main.cpp
--- a/imconfig.h
+++ b/imconfig.h
--- a/imgui.cpp
+++ b/imgui.cpp
--- a/imgui.h
+++ b/imgui.h
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
--- a/imgui_internal.h
+++ b/imgui_internal.h
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp