Merge branch 'master' into 2016-02-colorpicker

Browse Source

...

This commit is contained in:

ocornut

2016-05-29 19:07:23 +02:00

parent 6bcc31e575 0fb51b6b4b

commit 3ddb50a925

21 changed files with 1731 additions and 1197 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1969

imgui.cpp

File diff suppressed because it is too large Load Diff