Merge branch 'master' into 2016-02-colorpicker

This commit is contained in:
ocornut
2016-04-09 19:12:03 +02:00
50 changed files with 3906 additions and 919 deletions

View File

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