Merge branch 'master' into Mario/nades_mutator
authorMario <mario.mario@y7mail.com>
Tue, 11 Jun 2013 04:14:56 +0000 (14:14 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 11 Jun 2013 04:14:56 +0000 (14:14 +1000)
commita7a6ac0b8def59be46e86e3c8bd0bf6eb13a4983
tree3e593c3949771fd714e8a3aef883339222b574fe
parent0c62b090b342bab399152f8673c83c9884c5b8fb
parent72646dce0aa577090f682ed30c94509f9e3d8046
Merge branch 'master' into Mario/nades_mutator
qcsrc/client/projectile.qc
qcsrc/server/mutators/mutator_nades.qc