Merge branch 'viewport' into docking

# Conflicts:
#	docs/CHANGELOG.txt
#	imgui_widgets.cpp
This commit is contained in:
omar
2018-11-22 15:29:18 +01:00
12 changed files with 63 additions and 35 deletions

View File

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