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

Browse Source

...

This commit is contained in:

ocornut

2015-04-07 13:51:01 +01:00

parent 6ba7a74191 d692286862

commit 323ae8326e

12 changed files with 557 additions and 286 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

727

imgui.cpp

File diff suppressed because it is too large Load Diff