Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2021-05-24 17:49:20 +02:00
13 changed files with 182 additions and 109 deletions

View File

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