Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-05-31 16:59:01 +01:00

parent e3f2ad728a 8738147aee

commit a76eea85c8

7 changed files with 1312 additions and 524 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

+1137 -434

File diff suppressed because it is too large Load Diff