Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2019-07-27 18:21:41 -07:00
11 changed files with 73 additions and 44 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.72 WIP
// dear imgui, v1.72
// (widgets code)
/*