Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
ocornut
2021-03-15 20:38:34 +01:00
14 changed files with 151 additions and 91 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.82 WIP
// dear imgui, v1.82
// (demo code)
// Help: