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

Browse Source

# Conflicts:
#	Content/Levels/Business2.umap
#	Content/Levels/Business2_BuiltData.uasset
#	Content/Levels/Business3.umap
#	Content/Levels/Business3_BuiltData.uasset
#	Content/Levels/Business4.umap
#	Content/Levels/Lights_BuiltData.uasset
#	Content/Levels/business1.umap
#	Content/Levels/business1_BuiltData.uasset

...

This commit is contained in:

Maxim

2019-04-30 19:23:08 +05:00

parent b78baf4eb7 4751910224

commit 2d00a1fe49

71 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/MI_CeilingPerforated.uasset

BIN

Binary file not shown.

Content/Materials/MI_WallPlygon.uasset

BIN

Binary file not shown.