Merge remote branch 'origin/master' into samual/fixes_for_latest_merge
authorSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)
committerSamual <samual@xonotic.org>
Wed, 30 Mar 2011 07:34:19 +0000 (03:34 -0400)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

Simple merge
Simple merge
Simple merge