Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:55:33 +0000 (19:55 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 22 Jul 2010 16:55:33 +0000 (19:55 +0300)
1  2 
defaultXonotic.cfg

Simple merge