Dron 27c44856c4 Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA ...

# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/S2F1.umap
#	Content/Meshes/Building_3/SM_Bld4_Annex.uasset

2019-10-28 22:30:58 +05:00

..

Building2

…

Building4

…

Building_3

…

Buildings

…

Environment

Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

2019-10-28 22:30:58 +05:00

Furniture

…

interior

…

SM_Couch2_MOP.uasset

…

SM_Couch_MOP.uasset

…

SM_Elevator_cargo.uasset

…

SM_Elevator_Door.uasset

…

SM_Elevator_OTIS.uasset

…

SM_Elevator.uasset

…

SM_ElevatorButtons001.uasset

…

SM_ElevatorButtons_Light.uasset

…

SM_ElevatorButtons.uasset

…

SM_Flag.uasset

…

SM_Flowerpot_MOP.uasset

…

SM_S2_Mailbox.uasset

…

SM_Stand_MOP.uasset

…

SM_Stella.uasset

…

SM_TP1.uasset

…

SM_TP2.uasset

…

SM_Ventilation.uasset

…