PC-G04 b9f33ac728 Merge branch 'master' of http://192.168.1.163:3000/Dron/lifeResidence ...

# Conflicts:
#	Content/Meshes/Interior/Gp2/Plinth/SM_GP2_F2_S01_A02_Plinth.uasset

2023-04-07 12:34:16 +05:00

Config

…

Content

…

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%