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)
1  2 
defaultXonotic.cfg
qcsrc/client/projectile.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge