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

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-05-15 17:31:56 +01:00

parent 08fd6a7e7d e57ee2852a

commit 1eafe86627

6 changed files with 346 additions and 225 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

502

imgui.cpp

File diff suppressed because it is too large Load Diff