Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
This commit is contained in:
ocornut
2026-08-04 14:34:04 +02:00
42 changed files with 2048 additions and 78 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.92.9b
// dear imgui, v1.93.0 WIP
// (widgets code)
/*