Merge branch 'master' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2019-05-10 22:56:43 +02:00
10 changed files with 462 additions and 380 deletions

View File

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