]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Mon, 28 Mar 2011 07:39:30 +0000 (03:39 -0400)
committerSamual <samual@xonotic.org>
Mon, 28 Mar 2011 07:39:30 +0000 (03:39 -0400)
commit8dc2a5c3bbca390c605f4e0d185c373e66c607b0
tree2fce00e7be1dd89f5c18c1b02e2a0dcc96f56013
parent0840737ecde3313d902ff7a2b1e53d0102991e56
parentef95da81bce164492f4a9ccef8cf3b45e9423a53
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/g_damage.qc