Merge branch 'master' into docking

ac64b65 on master seemed incorrect. # Conflicts: # docs/CHANGELOG.txt # imgui.cpp # imgui_internal.h # imgui_widgets.cpp
2026-11-10 19:03:30 +00:00 · 2023-08-25 14:20:51 +02:00 · 2023-08-25 14:20:51 +02:00 · 676497fe05
commit 676497fe05
parent 1161301386 4a81424492
11 changed files with 154 additions and 54 deletions
--- a/backends/imgui_impl_sdl2.cpp
+++ b/backends/imgui_impl_sdl2.cpp
--- a/backends/imgui_impl_sdl2.h
+++ b/backends/imgui_impl_sdl2.h
--- a/backends/imgui_impl_sdl3.cpp
+++ b/backends/imgui_impl_sdl3.cpp
--- a/backends/imgui_impl_sdl3.h
+++ b/backends/imgui_impl_sdl3.h
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
--- 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_tables.cpp
+++ b/imgui_tables.cpp
--- a/imgui_widgets.cpp
+++ b/imgui_widgets.cpp