Merge branch 'master' into docking

# Conflicts: # backends/imgui_impl_win32.cpp # docs/CHANGELOG.txt
2026-10-22 22:44:21 +00:00 · 2023-02-15 18:18:47 +01:00 · 2023-02-15 18:18:47 +01:00 · e25e4526cd
commit e25e4526cd
parent 192196711a 5d74891285
10 changed files with 51 additions and 22 deletions
--- a/backends/imgui_impl_win32.cpp
+++ b/backends/imgui_impl_win32.cpp
--- 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_draw.cpp
+++ b/imgui_draw.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
--- a/misc/freetype/imgui_freetype.cpp
+++ b/misc/freetype/imgui_freetype.cpp