Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage...
authorFruitieX <fruitiex@gmail.com>
Mon, 20 Dec 2010 13:39:54 +0000 (15:39 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 20 Dec 2010 13:39:54 +0000 (15:39 +0200)
commitcd69929f60e2df88000c2558629ce650204aca26
treef33544f003200b0637aeea9bd5275a3b63d390a7
parent6466744922d3260fd843212f818c7562abf7b43b
parent72ab0540e65d8296d4d62c056f099c82bb815868
Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage-dmg_take
defaultXonotic.cfg