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

Browse Source

# Conflicts:
#	Content/Materials/M_TileClear.uasset
#	Content/Materials/Material_Instances/MI_СontainerBlue.uasset

...

This commit is contained in:

Maxim

2019-05-29 12:38:45 +05:00

parent b14e309f18 ddcc18a74c

commit 68184fb4ba

2 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/Materials/M_TileClear.uasset

BIN

Binary file not shown.

Content/Materials/Material_Instances/MI_СontainerBlue.uasset

BIN

Binary file not shown.