Merge remote-tracking branch 'origin/master' into Mario/mutators
authorSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 19:20:05 +0000 (15:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 19:20:05 +0000 (15:20 -0400)
commitf2804031fdb2889c46959e91ea9da121e6731686
treebc2ab321029061c1aee8c1334d7d051790a94cba
parentb0b4d6b657c4507749da05b81f97cbb9449aa0de
parente6bb286fd1beb18b27fd5c73da319977b4b7b78c
Merge remote-tracking branch 'origin/master' into Mario/mutators
defaultXonotic.cfg
qcsrc/client/projectile.qc
qcsrc/server/g_world.qc