Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
authorSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
committerSamual <samual@xonotic.org>
Fri, 29 Apr 2011 05:35:24 +0000 (01:35 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc

Simple merge
Simple merge