From: Rudolf Polzer Date: Tue, 21 Dec 2010 06:17:23 +0000 (+0100) Subject: Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent... X-Git-Tag: xonotic-v0.1.0preview~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f05fffaca85fdb6af5f1d5baeeded5a3b45ce0f;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent/virtual-mirror-damage' --- 3f05fffaca85fdb6af5f1d5baeeded5a3b45ce0f