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

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-06-21 20:01:25 -06:00

parent b360c83e92 0884cb51cd

commit 0b98d3eb26

2 changed files with 684 additions and 471 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

1130

imgui.cpp

File diff suppressed because it is too large Load Diff