Merge branch 'master' of http://192.168.1.163:3000/Zheka3777123/URA

Browse Source

# Conflicts:
#	Content/Instances/Fabric/MI_Fabric_22.uasset

...

This commit is contained in:

zheka3777123

2019-10-28 17:01:12 +05:00

parent be5de27d91 aaf3f3e785

commit a643317977

7 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/Instances/MI_Mirror_2.uasset

BIN

Binary file not shown.

Content/Level/Building1.umap

BIN

Binary file not shown.

Content/Meshes/Buildings/SM_Bld01_Win1.uasset

BIN

Binary file not shown.

Content/Meshes/Buildings/SM_Building01.uasset

BIN

Binary file not shown.

Content/Meshes/SM_Flag.uasset

BIN

Binary file not shown.

Content/Meshes/SM_Stella.uasset

BIN

Binary file not shown.

Content/Textures/T_Flag_Stella_BC.uasset

BIN

Binary file not shown.