Merge branch 'master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 11 Jul 2010 00:19:15 +0000 (03:19 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 11 Jul 2010 00:19:15 +0000 (03:19 +0300)
1  2 
defaultXonotic.cfg

Simple merge