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

Browse Source

# Conflicts:
#	Content/Levels/Environment.umap

...

This commit is contained in:

Lenta_Mebiusa

2019-02-14 12:57:06 +05:00

parent 3ebd0b13ab 10d91318d9

commit d6d320c5f4

4 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/AM_vol4/Textures/T_AM_vol4_grass_01_N.uasset

BIN

Binary file not shown.

Content/AM_vol4/Textures/T_AM_vol4_grass_02_BC.uasset

BIN

Binary file not shown.

Content/AM_vol4/Textures/T_AM_vol4_plasterdirty_01_BC.uasset

BIN

Binary file not shown.

Content/Environment/BasketZone/textures/Т_Park_3d_M.uasset

BIN

Binary file not shown.