Merge branch 'master' into Mario/buff_updates
authorMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 3 Apr 2015 07:48:19 +0000 (18:48 +1100)
1  2 
mutators.cfg
qcsrc/server/autocvars.qh

diff --cc mutators.cfg
Simple merge
Simple merge