]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/race_cts_mutators
authorMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 23:00:11 +0000 (09:00 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 23:00:11 +0000 (09:00 +1000)
commit7b15197339e0263e56a6684f8a1b3890ba6d367b
treeb885f933ecf3d138b76558a870221e5a4c22d9bd
parentbbc91d75af836fb704cd1a1c4c0af03cb4052381
parente69d5a700ec5451c172b8b0b9287a2625e45147c
Merge branch 'master' into Mario/race_cts_mutators
qcsrc/server/anticheat.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_physics.qc
qcsrc/server/cl_player.qc
qcsrc/server/command/getreplies.qc
qcsrc/server/g_damage.qc
qcsrc/server/sv_main.qc
qcsrc/server/teamplay.qc