Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives

Browse Source

...

This commit is contained in:

ocornut

2015-03-09 18:06:39 +00:00

parent 8dd3f854fe d440a13b7e

commit 378eee490b

28 changed files with 2099 additions and 1554 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

+403 -191

File diff suppressed because it is too large Load Diff