]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mario/monsters
authorMario <mario.mario@y7mail.com>
Tue, 5 Feb 2013 10:23:45 +0000 (21:23 +1100)
committerMario <mario.mario@y7mail.com>
Tue, 5 Feb 2013 10:23:45 +0000 (21:23 +1100)
commit23b8d3a0e72974b6e5068a00bf9edd8788617d52
treefbabac5de04ade10b68182fbce48fb7aefe78075
parentaebd05defc753eaef9fa87c49d60fafcf17554c5
parentd205541c9121131a1caddd9180ed8befef596f15
Merge branch 'master' into mario/monsters
qcsrc/server/cl_client.qc
qcsrc/server/g_world.qc
qcsrc/server/mutators/mutators.qh
qcsrc/server/progs.src
qcsrc/server/teamplay.qc