Merge branch 'master' into mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Thu, 7 Mar 2013 06:22:48 +0000 (17:22 +1100)
committerMario <mario.mario@y7mail.com>
Thu, 7 Mar 2013 06:22:48 +0000 (17:22 +1100)
commitb2c2d31803d0620b3af3cb1e792cfbd60732155f
tree3cc1390e23086a70982135625de75dfb253a17b1
parenta53768f20ae1838a151d010919c8c4d4e4d47cc4
parent8ca52c052b625e76506d033d16aae0525bd5927a
Merge branch 'master' into mario/mutator_minstagib
14 files changed:
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.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/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
qcsrc/server/w_common.qc
qcsrc/server/w_laser.qc
qcsrc/server/w_minstanex.qc