Merge branch 'master' into navigation

# Conflicts:
#	imgui.h
This commit is contained in:
omar
2017-10-27 17:27:53 +02:00
5 changed files with 6 additions and 6 deletions

View File

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