Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
#	imgui_demo.cpp
This commit is contained in:
ocornut
2026-02-20 18:07:02 +01:00
12 changed files with 298 additions and 250 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.6
// dear imgui, v1.92.7 WIP
// (drawing and font code)
/*