Merge branch 'master_164' into viewport_164

# Conflicts:
#	imgui.cpp
#	imgui_draw.cpp
#	imgui_widgets.cpp
This commit is contained in:
omar
2018-08-31 10:28:21 +02:00
7 changed files with 109 additions and 86 deletions

View File

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