Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2020-06-29 17:15:40 +02:00
10 changed files with 53 additions and 157 deletions

View File

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