Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Mon, 17 May 2010 17:17:45 +0000 (20:17 +0300)
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc

Simple merge
Simple merge