]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/mutator_minstagib
authorMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 00:39:58 +0000 (10:39 +1000)
committerMario <mario.mario@y7mail.com>
Tue, 9 Apr 2013 00:39:58 +0000 (10:39 +1000)
commit5b6514ad570d0210590f6fb10b6abd26df38cbd8
treec78beb64f9d76cd3ae00c74dca3a3ff2f17ea749
parent5db892c4244fa01678787f3e1da7c9bce9c44029
parent3dc40508b67a99d214d774104ecaa0b974d704aa
Merge branch 'master' into Mario/mutator_minstagib
qcsrc/server/autocvars.qh
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/base.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc