]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/issues/1490'
authorTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 06:24:34 +0000 (16:24 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Fri, 21 Aug 2015 06:24:34 +0000 (16:24 +1000)
commita97f97fea293089f2e7b6c26304d4355a649cde3
treeeb0d9b50abe7d240220fb9cb633d5324dc825e26
parent91b39b7f670f5a1234c18ec92851eb1a1f176d8c
parentbc996d1cf2bb0de381c06a2ad07bed5d333e3e84
Merge branch 'TimePath/issues/1490'

# Conflicts:
# qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/server/g_damage.qc
qcsrc/server/mutators/gamemode_ctf.qc
qcsrc/server/mutators/mutator_nades.qc
qcsrc/server/mutators/mutator_overkill.qc