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)
commitbb83fecdaaa8366c8eefda25743b0958ca129fb4
tree4355d75bd010a81e7784d4e28710f1a078bea208
parentcd69929f60e2df88000c2558629ce650204aca26
parent9af625c5b69d892391c2be8f6358b3d263835b82
Merge remote branch 'origin/divVerent/virtual-mirror-damage' into fruitiex/hud_damage-dmg_take
defaultXonotic.cfg