Merge branch 'master' into Mario/despawn_effects
authorMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 08:37:11 +0000 (19:37 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 08:37:11 +0000 (19:37 +1100)
commitbf825a0dada529d1288564e23223061429d01f31
tree0ea0d80502b5cbdaab0010c6d48085feafa402f1
parent2b89f5bdd3be253aa44320dc71f70f283df3b5ee
parentd55940c3b65bffebfd3c571067398c65b29e9488
Merge branch 'master' into Mario/despawn_effects
qcsrc/server/autocvars.qh
qcsrc/server/teamplay.qc