Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2022-11-15 15:40:54 +01:00
12 changed files with 132 additions and 110 deletions

View File

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