Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 08:45:01 +0000 (11:45 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Sun, 15 Aug 2010 08:45:01 +0000 (11:45 +0300)
1  2 
defaultXonotic.cfg

Simple merge