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

Browse Source

Conflicts:
	imgui.cpp
	imgui.h

...

This commit is contained in:

ocornut

2015-05-15 17:33:04 +01:00

parent f00662a5ad e57ee2852a

commit e9b6e437eb

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

+294 -209

File diff suppressed because it is too large Load Diff