Merge branch 'viewport' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui.cpp
This commit is contained in:
omar
2018-12-04 00:06:26 +01:00
11 changed files with 47 additions and 25 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.66b
// dear imgui, v1.67 WIP
// (drawing and font code)
/*