Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

Browse Source

...

This commit is contained in:

ocornut

2015-06-14 20:29:10 -06:00

parent a76eea85c8 6eb1fec7a9

commit b360c83e92

3 changed files with 221 additions and 144 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

+198 -136

File diff suppressed because it is too large Load Diff