Merge branch 'master' into viewport

# Conflicts:
#	imgui.cpp
This commit is contained in:
omar
2018-09-06 15:59:35 +02:00
11 changed files with 24 additions and 15 deletions

View File

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