Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
#	imgui_demo.cpp
This commit is contained in:
ocornut
2024-07-30 16:57:42 +02:00
9 changed files with 139 additions and 116 deletions

View File

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