Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:53:35 +0000 (10:53 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 5 Jun 2013 00:53:35 +0000 (10:53 +1000)
1  2 
commands.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_minstagib.qc

diff --cc commands.cfg
Simple merge
Simple merge
Simple merge
Simple merge