Merge branch 'viewport' into docking

# Conflicts:
#	docs/CHANGELOG.txt
This commit is contained in:
omar
2018-12-03 11:44:51 +01:00
9 changed files with 15 additions and 16 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.67 WIP
// dear imgui, v1.66b
// (demo code)
// Message to the person tempted to delete this file when integrating Dear ImGui into their code base: