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

Browse Source

# Conflicts:
#	Content/Level/Environment.umap
#	Content/Level/Index.umap

...

This commit is contained in:

Lenta_Mebiusa

2019-10-23 16:24:48 +05:00

parent dc4d5c117a 15d3a1ef2f

commit 76034edabd

14 changed files with 30 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/Level/Lights.umap

BIN

Binary file not shown.

Content/Level/MAF.umap

BIN

Binary file not shown.