Merge branch 'master' into viewport

# Conflicts:
#	docs/CHANGELOG.txt
#	examples/imgui_impl_win32.cpp
#	examples/imgui_impl_win32.h
This commit is contained in:
omar
2019-01-15 21:22:21 +01:00
10 changed files with 90 additions and 16 deletions

View File

@ -1,4 +1,4 @@
// dear imgui, v1.67
// dear imgui, v1.68 WIP
// (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!