Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	imgui.cpp

...

This commit is contained in:

omar

2018-09-05 20:59:27 +02:00

parent 8601c39571 bb3184af74

commit 31b5b18611

2 changed files with 406 additions and 387 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

+224 -387

File diff suppressed because it is too large Load Diff