Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_internal.h
This commit is contained in:
ocornut
2023-04-13 16:24:09 +02:00
10 changed files with 207 additions and 144 deletions

View File

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