Merge branch 'master' into terencehill/newpanelhud
authorFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)
committerFruitieX <rasse@rasse-laptop.(none)>
Thu, 21 Oct 2010 18:40:17 +0000 (21:40 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/View.qc

Simple merge
Simple merge