Merge branch 'master' into fruitiex/newpanelhud_stable
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 7 Jul 2010 12:29:40 +0000 (15:29 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 7 Jul 2010 12:29:40 +0000 (15:29 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc

Simple merge
Simple merge
Simple merge