PC-G12 68090f1d7a Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence ...

# Conflicts:
#	Content/Maps/MainBuildings.umap
#	Content/Meshes/MainBuildings/SM_GP1_S01.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S02.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S03.uasset
#	Content/Meshes/MainBuildings/SM_GP1_S04.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S1.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S2.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S3.uasset
#	Content/Meshes/MainBuildings/SM_GP2_S4.uasset

2023-04-17 20:08:47 +05:00

Config

…

Content

Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence

2023-04-17 20:08:47 +05:00

Platforms/HoloLens/Config

…

Plugins

…

.gitignore

…

.p4ignore

…

lifeResidence.uproject

…

S

Description

No description provided

28 GiB

Languages

C++ 85.4%

Python 8.5%

C# 5.6%

C 0.3%

Batchfile 0.2%