Merge branch 'master' into viewport

# Conflicts:
#	examples/imgui_impl_sdl.cpp
This commit is contained in:
omar
2018-11-26 14:53:51 +01:00
9 changed files with 47 additions and 10 deletions

View File

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