Dron/Ivazovsky
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Files
df24de7f10cf8370ff9e197e70cbb09e44b3ebcf
Ivazovsky/Content/Maps/Interiors/GP4S1
T
History
Andron666 df24de7f10 Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Maps/Interiors/GP4S1/Unique/S01A08.umap
#	Content/Maps/Interiors/GP4S5/Unique/S05A05.umap
#	Content/Maps/NightlightAim.umap
#	Content/Maps/Yard_GP4.umap
#	Content/Materials/FakeInteriors/MI_CubeRoom_1.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_2.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_3.uasset
#	Content/Materials/FakeInteriors/MI_CubeRoom_6.uasset
#	Content/Materials/FakeInteriors/MI_FakeEmpty.uasset
#	Content/Meshes/Furniture/Custom/SM_CylLamp_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_AI_SM_Door_Frame.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_AI_SM_Door_Front_AI.uasset
#	Content/Meshes/Furniture/Custom/SM_Door_Front_Frame_AI.uasset
2022-03-24 13:14:31 +05:00
..
pointers
sdfnslfg
2022-03-22 08:48:05 +05:00
Unique
Merge branch 'master' of http://192.168.1.163:3000/Dron/Ivazovsky into developer
2022-03-24 13:14:31 +05:00