Merge branch 'master' of http://192.168.1.163:3000/Maxim/Airport46

Browse Source

# Conflicts:
#	Content/BP_Tools/BP_S1Roof.uasset
#	Content/BP_Tools/BP_S2F1Exterior.uasset
#	Content/Meshes/Turn1_Level1/S1_Roof.uasset

...

This commit is contained in:

Maxim

2019-02-04 15:05:07 +05:00

parent 0f7c6567b1 7495b78ba6

commit fcd74bf033

33 changed files with 2 additions and 4 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/Turn1_Level1.umap

BIN

Binary file not shown.

Content/Levels/Turn1_Level2.umap

BIN

Binary file not shown.