Merge branch 'master' into mirceakitsune/nex_reticle
authorFruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Thu, 24 Jun 2010 12:00:24 +0000 (15:00 +0300)
1  2 
defaultXonotic.cfg

Simple merge