Merge branch 'master' into Mario/gametype_votes
authorMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:09:45 +0000 (17:09 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:09:45 +0000 (17:09 +1100)
commit50b99ba384dadafe7d4e15be889cdb6cce5189a7
treeb96b3eabd1244fa9686cd2cd337d161d664e93e7
parentd3ad6bb968f84b2aa2269d3b9951e733f0f7b903
parent4f14e187eed72fc81aa829300f95a6d689cbced6
Merge branch 'master' into Mario/gametype_votes
qcsrc/common/constants.qh