Merge branch 'master' into navigation

# Conflicts:
#	imgui.h
This commit is contained in:
omar
2017-12-26 15:37:31 +01:00
5 changed files with 33 additions and 15 deletions

View File

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