Merge branch 'master' of 1.drake.imon.nu:TacticalZ-assets

Browse Source

# Conflicts:
#	Models/Effects/CylinderShot.mesh
#	Models/Effects/CylinderShot.mtrl

...

This commit is contained in:

antc13

2016-02-10 21:18:28 +01:00

parent 41d49ed7d4 172b3ad527

commit c690e1fb53

310 changed files with 0 additions and 47 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

Models/Effects/JumpEffectHexagon.mesh

BIN

Binary file not shown.

Models/Effects/JumpEffectHexagon.mtrl

BIN

Binary file not shown.