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)
commit278f5440b4272f696c6b6e5bb9bb3139b8b53a11
treec9975a26d0f050bc42a7cdea1500049fb372845b
parent2edeb8354bb93aae319d75077a44c0fd0b4f6ca2
parent8d87869f627ac691ce4bd20bad9d4e57b487ac20
Merge branch 'master' into Mario/mutator_minstagib
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