Merge remote branch 'origin/master' into mirceakitsune/damage_effects
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:16:35 +0000 (20:16 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:16:35 +0000 (20:16 -0500)
1  2 
defaultXonotic.cfg
qcsrc/server/vehicles/raptor.qc

Simple merge
Simple merge