Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
ocornut
2021-02-10 21:28:16 +01:00
14 changed files with 35 additions and 32 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.81 WIP
// dear imgui, v1.81
// (main code and documentation)
// Help: