Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2024-02-20 15:33:20 +01:00
10 changed files with 92 additions and 50 deletions

View File

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