Merge branch 'master' into docking

# Conflicts:
#	imgui.cpp
This commit is contained in:
ocornut
2024-02-22 20:01:46 +01:00
8 changed files with 106 additions and 45 deletions

View File

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