Merge branch 'master' into viewport

# Conflicts:
#	examples/imgui_impl_glfw.cpp
#	examples/imgui_impl_win32.cpp
This commit is contained in:
omar
2018-06-22 12:01:42 +02:00
31 changed files with 199 additions and 185 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.62 WIP
// dear imgui, v1.62
// (internals)
// You may use this file to debug, understand or extend ImGui features but we don't provide any guarantee of forward compatibility!