Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
authorSamual Lenks <samual@xonotic.org>
Fri, 7 Sep 2012 03:51:29 +0000 (23:51 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 7 Sep 2012 03:51:29 +0000 (23:51 -0400)
commitcd5790a770717f937f0cf6d5437eaf3a76787e11
tree0eb941f65f2278e6afdf18f1cb7c5772bd9fdc00
parenta629d274753e702c0bef047fbe78199bfde3a74c
parentb82161b356e31ce554369a42da80037f85f592e1
Merge remote-tracking branch 'origin/master' into samual/mutator_ctf
defaultXonotic.cfg