BTH/vstyler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Materials/M_Frame.mat.meta
+2 -2
View File
@@ -1,6 +1,6 @@
fileFormatVersion: 2
guid: 778ed9bad4929f04e874fb135e3f7636
timeCreated: 1464200339
guid: cb126faf862491548bd2354abaf1ace4
timeCreated: 1464198942
licenseType: Free
NativeFormatImporter:
userData: