Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master

# Conflicts: # Content/VRTemplate/Maps/VRTemplateMap.umap # Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2.commit
2022-03-07 17:33:55 +02:00 · 2022-03-07 17:31:45 +02:00
5 changed files with 10 additions and 10 deletions
--- a/Content/Siim_migrated/MI_West_SPG_M109_Damaged.uasset
+++ b/Content/Siim_migrated/MI_West_SPG_M109_Damaged.uasset
--- a/Content/Siim_migrated/M_Decos_Facade01.uasset
+++ b/Content/Siim_migrated/M_Decos_Facade01.uasset
--- a/Content/Siim_migrated/M_Villa_Pillar_1.uasset
+++ b/Content/Siim_migrated/M_Villa_Pillar_1.uasset
--- a/Content/Siim_migrated/M_Villa_Plaster_1.uasset
+++ b/Content/Siim_migrated/M_Villa_Plaster_1.uasset
--- a/Content/Siim_migrated/Materials/M_Villa_Pillar_1.uasset
+++ b/Content/Siim_migrated/Materials/M_Villa_Pillar_1.uasset
Author	SHA1	Message	Date
l31tm0t1f	efa77c7dbb	Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master # Conflicts: # Content/VRTemplate/Maps/VRTemplateMap.umap # Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset	2022-03-07 17:33:55 +02:00
l31tm0t1f	c936cbdc02	2.commit	2022-03-07 17:31:45 +02:00