Merge remote branch 'origin/master' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 23:04:27 +0000 (02:04 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Fri, 23 Jul 2010 23:04:27 +0000 (02:04 +0300)
1  2 
defaultXonotic.cfg

Simple merge