]> 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 18:23:01 +0000 (14:23 -0400)
committerSamual <samual@xonotic.org>
Mon, 28 Mar 2011 18:23:01 +0000 (14:23 -0400)
commit85fcc50125959d738f1295bfc1645cad4c8b26fc
tree9f9528a02e85ac3e84f11e13edd445cfbc2596aa
parent1ec09d8b4f3168d246934091de70f89bc6b358d5
parent7cd3da8ab444ad396d34392c2d899c5799128508
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/g_damage.qc
qcsrc/server/progs.src