Merge branch 'master' into viewport

Browse Source

# Conflicts:
#	imgui.cpp

...

This commit is contained in:

omar

2018-09-06 11:42:11 +02:00

parent 31b5b18611 e58bc3d5b7

commit a2616c79fe

5 changed files with 467 additions and 406 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

+334 -324

File diff suppressed because it is too large Load Diff