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

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-05-02 22:20:14 +01:00

parent 86d1abf3f6 d84b5737a6

commit 08fd6a7e7d

6 changed files with 403 additions and 195 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

+374 -181

File diff suppressed because it is too large Load Diff