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

Browse Source

# Conflicts:
#	Content/Meshes/Cockpit/SM_Disk_001.uasset
#	Content/Meshes/Cockpit/SM_PanelBack.uasset
#	Content/Meshes/Cockpit/SM_PanelCentral.uasset

...

This commit is contained in:

Lenta_Mebiusa

2019-07-03 17:35:36 +05:00

parent 0f62ee5799 1aa554bc3d

commit c27d168f1a

45 changed files with 19 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Content/Levels/Cabin.umap

BIN

Binary file not shown.

Content/Levels/Exterior.umap

BIN

Binary file not shown.

Content/Levels/Lights.umap

BIN

Binary file not shown.