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

Browse Source

# Conflicts:
#	Content/Level/Lights.umap

...

This commit is contained in:

Andron666

2019-10-25 17:13:05 +05:00

parent 0d17139fe4 9b5b830fb1

commit 1ea1891ea1

22 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/Level/NewWorld.umap

BIN

Binary file not shown.

Content/Level/S2F1.umap

BIN

Binary file not shown.

Content/Level/S2F1_Mebel.umap

BIN

Binary file not shown.

Content/Level/S2F2.umap

BIN

Binary file not shown.

Content/Level/S2F2_Mebel.umap

BIN

Binary file not shown.

Content/Level/S3F1.umap

BIN

Binary file not shown.

Content/Level/S3F2.umap

BIN

Binary file not shown.