Merge branch 'master' into dev

Browse Source

Conflicts:
	code/GenVertexNormalsProcess.cpp

pull/257/head

tszirr 2014-04-21 23:37:32 +02:00

parent 25c2dd58de 51cb2c042c

commit ed0c48075f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available