]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Tue, 17 Apr 2012 15:17:40 +0000 (11:17 -0400)
committerSamual <samual@xonotic.org>
Tue, 17 Apr 2012 15:17:40 +0000 (11:17 -0400)
commitd957e789b57a046f8456b5e88ed4abfa5a34f6f1
tree14b0d0a87f786b145c59bec6ca0c5347ec8819bb
parentb49f2db934d91ae251449558722151c952f50ede
parent3109ec4bce09b9bc670788df27e72772ef84739d
Merge remote branch 'origin/master' into samual/mutator_ctf
qcsrc/server/g_damage.qc