Merge branch 'master' of https://github.com/jtilander/imgui into jtilander-master

Browse Source

Conflicts:
	imgui.cpp

...

This commit is contained in:

ocornut

2015-02-04 09:30:03 +01:00

parent 4e33787c2f 087ded0c71

commit e36fad65dd

2 changed files with 141 additions and 118 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

+138 -118

File diff suppressed because it is too large Load Diff