Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Mon, 7 Jan 2013 17:05:22 +0000 (04:05 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 7 Jan 2013 17:05:22 +0000 (04:05 +1100)
1  2 
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/cl_weaponsystem.qc
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/t_items.qc
qcsrc/server/w_common.qc
qcsrc/server/w_laser.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge