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

Browse Source

# Conflicts:
#	Content/Meshes/Specification/Door1050x2500_Box.uasset
#	Content/Meshes/Specification/Door1050x2500_Plane.uasset
#	Content/Meshes/Specification/DoorWin1700x2110_Box.uasset
#	Content/Meshes/Specification/DoorWin1960x2500_Box.uasset
#	Content/Meshes/Specification/DoorWin855x2500_Plane.uasset

...

This commit is contained in:

zheka3777123

2019-01-17 15:37:45 +05:00

parent 37b584fc6d 92dcf097f5

commit dbe2a4cbe3

30 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/Levels/Environment.umap

BIN

Binary file not shown.