Merge remote-tracking branch 'origin/master' into Templates

Browse Source

Conflicts:
	Assets/Door.FBX.meta
	Assets/DoorFrame.FBX.meta
	Assets/Materials/M_Door.mat
	Assets/Materials/M_Door.mat.meta
	Assets/Materials/M_Frame.mat
	Assets/Materials/M_Frame.mat.meta
	Assets/Materials/M_Glass.mat
	Assets/Materials/M_Glass.mat.meta
	Assets/WindowFrame.FBX.meta

...

This commit is contained in:

Tleety

2016-05-25 23:42:24 +02:00

parent 6bd8afd3e7 456680584f

commit b840315f73

220 changed files with 6486 additions and 12 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

Assets/Materials/M_Frame.mat

BIN

Binary file not shown.