Merge branch 'master' into docking

# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_internal.h
This commit is contained in:
ocornut
2024-11-21 14:48:23 +01:00
15 changed files with 591 additions and 251 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.91.5
// dear imgui, v1.91.6 WIP
// (widgets code)
/*