]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into Mario/domination_mutator
authorSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 21:49:01 +0000 (16:49 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 21:49:01 +0000 (16:49 -0500)
commite41d94d1b12b31f8363bb665478fef13df0e321e
tree2105526ab110dfd241c6ed9dbecc0232a4b3bd2c
parentb49ceab1f3752842fa7d859e0b8e2677151164cc
parente11a031d17d1e95071d9b2e8fe3f4466d4a3a908
Merge remote-tracking branch 'origin/master' into Mario/domination_mutator
qcsrc/server/cl_client.qc
qcsrc/server/scores_rules.qc