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

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-06-29 15:43:58 -06:00

parent 0b98d3eb26 af0de5f357

commit 43dcd6ef47

2 changed files with 436 additions and 246 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

+420 -235

File diff suppressed because it is too large Load Diff