Merge branch 'master' of git.unistra.fr:chirz/cityescape

36a67c21 · v.bloch · 5bbd5968 · 50040de1 · 36a67c21 · 36a67c21
Commit 36a67c21 authored 3 years ago by v.bloch
--- a/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab
--- a/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Melvyn_village 1.prefab.meta
+fileFormatVersion: 2
+guid: b9f8617378865674c91edd2902e37e9a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/Parcelles/Melvyn_village.prefab
+++ b/Assets/Prefabs/Parcelles/Melvyn_village.prefab
--- a/Assets/Prefabs/Parcelles/Melvyn_village.prefab.meta
+++ b/Assets/Prefabs/Parcelles/Melvyn_village.prefab.meta
+fileFormatVersion: 2
+guid: 162cd58adf4f4d047a4702715064d160
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: