PC-G13 b93abcd470 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence ...

# Conflicts:
#	Content/Blueprints/Lamp/Interior_Konserva/BP_InteriorLamp_Lamp_1.uasset
#	Content/Blueprints/Lamp/Interior_Lounge/BP_InteriorLamp_Cylindr_Res.uasset
#	Content/Blueprints/Lamp/Interior_Minimalism/BP_InteriorLamp_Pendant_Crouise.uasset
#	Content/Furniture/Vol2_Unsorted/FurniturePack/Assets/Furniture/Lamps/WallLampsMaterial/MI_WallLamp.uasset

2023-04-11 16:27:29 +05:00

Config

…

Content

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

2023-04-11 16:27:29 +05:00

Platforms/HoloLens/Config

…

Plugins

…

Source

…

.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%