Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage...
authorFruitieX <fruitiex@gmail.com>
Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 20 Dec 2010 14:04:31 +0000 (16:04 +0200)
1  2 
defaultXonotic.cfg

Simple merge