Merge branch 'master' into Mario/gametype_votes
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:19:00 +0000 (22:19 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 11:19:00 +0000 (22:19 +1100)
commitbe5a823f20ae87084f1e4f5ea9cfd69577bc7ba0
treebf3b7dde709da7606378504aa7a274b85da69243
parentb4c19832b9175becaa6652b7b5a9a26edbc99568
parent7707fea0c30532e68e57493ac41667ad0c4b1a29
Merge branch 'master' into Mario/gametype_votes
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/progs.src