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

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-06-29 15:40:38 -06:00

parent 01cb0dc7f7 af0de5f357

commit 0bf90770b0

2 changed files with 437 additions and 247 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

657

imgui.cpp

File diff suppressed because it is too large Load Diff