Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2022-11-16 17:57:05 +01:00
8 changed files with 97 additions and 91 deletions

View File

@@ -1,4 +1,4 @@
// dear imgui, v1.89
// dear imgui, v1.89.1 WIP
// (drawing and font code)
/*