Merge remote-tracking branch 'origin' into 2016-02-colorpicker

Browse Source

...

This commit is contained in:

ocornut

2016-08-11 22:53:26 +02:00

parent 1ef7980e17 6eb35b8a04

commit 996eb080fa

9 changed files with 279 additions and 223 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

imgui.cpp

+234 -187

File diff suppressed because it is too large Load Diff