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

Browse Source

# Conflicts:
#	Content/Levels/Environment.umap
#	Content/Levels/Environment_BuiltData.uasset
#	Content/Material_Instance/MI_Stadium.uasset

...

This commit is contained in:

zheka3777123

2019-02-20 14:04:37 +05:00

parent 838bdae639 307fa634c2

commit 7e4d6f5826

10 changed files with 0 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/Material_Instance/MI_BasketballCourt.uasset

BIN

Binary file not shown.

Content/Material_Instance/MI_FootballField.uasset

BIN

Binary file not shown.

Content/Material_Instance/MI_Stadium.uasset

BIN

Binary file not shown.