Merge commit '6bd8afd3e7588e6c4e249821acea0fcf97f7d46d'

# 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
2016-05-26 23:54:07 +02:00
parent 17576b4713 6bd8afd3e7
commit e1e408580a
36 changed files with 219 additions and 1 deletions
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 59333be441c0e8042b8c2e75ae9d5f29
+timeCreated: 1464201019
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae7fe334022b0574cb52f4e90e3fa2b5
+timeCreated: 1464200340
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a6a6c2e668ad79449b48ee55868b4e2d
+timeCreated: 1464201025
+licenseType: Free
+NativeFormatImporter:
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: