Merge branch 'master' into 2016-02-colorpicker

This commit is contained in:
omar
2017-07-19 14:53:25 +08:00
13 changed files with 189 additions and 105 deletions

View File

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