Merge remote-tracking branch 'origin'

Browse Source

Conflicts:
	code/C4DImporter.cpp
	code/OgreImporter.h

...

This commit is contained in:

abma

2015-04-16 01:03:00 +02:00

parent bf4913b5c9 c95d32564c

commit 8c45a4dc3b

95 changed files with 32460 additions and 9658 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

949

code/ObjFileImporter.cpp

File diff suppressed because it is too large Load Diff