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)
1  2 
qcsrc/common/constants.qh
qcsrc/server/autocvars.qh
qcsrc/server/g_world.qc
qcsrc/server/progs.src

Simple merge
Simple merge
Simple merge
Simple merge