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

Browse Source

Conflicts:
	imgui.cpp
	imgui.h

...

This commit is contained in:

ocornut

2015-03-26 22:09:35 +00:00

parent ff1040a38d 2e26196aba

commit 26991bb2ec

5 changed files with 543 additions and 244 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

+454 -187

File diff suppressed because it is too large Load Diff