 PC-G04
|
16449ba834
|
Merge branch 'master' of http://192.168.1.163:3000/EgorSuv/SibIntel1
# Conflicts:
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F20_22_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F21_MOP.umap
# Content/Maps/Interior/GP9/MOPs/S9_Se01_F23_MOP.umap
# Content/Maps/Masharov_Buildings.umap
# Content/Maps/Masharov_Yard.umap
# Content/Meshes/Exterior/Main/SM_S9_Se01_Facade.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F03_09_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F10_13_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F14_15_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F16_18_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F19_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F20_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F21_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F22_Cap_Wall.uasset
# Content/Meshes/Interior/GP9/Se01/Cap_Wall/SM_S9_Se01_F23_Cap_Wall.uasset
|
2024-06-13 12:34:30 +05:00 |
|
Dron
PC-G13