Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Tue, 7 Apr 2015 20:16:20 +0000 (06:16 +1000)
committerMario <zacjardine@y7mail.com>
Tue, 7 Apr 2015 20:16:20 +0000 (06:16 +1000)
commitdf24112faf15050091bd940e7ed0c625b3c76c62
tree6c8dbf91ee4177e52ee9d743d7dd90bcd9477773
parentd354be0004140be3341a36d4640559ba8855eb4f
parentc91bb6a8b2cee2ed6ce6785951bb8c8f7d43d9b7
Merge branch 'master' into Mario/ctf_updates
qcsrc/client/hud.qc
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc