Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 8 May 2013 02:04:39 +0000 (12:04 +1000)
commit2bb2db9c0f8016645a23381d7493588d748ecacf
tree230ead2355107cacd063da79462f41f6f4ce926e
parent588148c163f6837f4608b4c1353f3bc7a88f57b5
parentede5abf38f36b3103b6e5170b6185b17652ce412
Merge branch 'master' into Mario/mutator_minstagib
19 files changed:
defaultXonotic.cfg
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/aim.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_impulse.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/defs.qh
qcsrc/server/g_damage.qc
qcsrc/server/g_world.qc
qcsrc/server/miscfunctions.qc
qcsrc/server/mutators/base.qh
qcsrc/server/mutators/mutator_minstagib.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/t_items.qc
qcsrc/server/teamplay.qc
qcsrc/server/w_minstanex.qc