Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
1  2 
defaultXonotic.cfg
qcsrc/server/g_damage.qc

Simple merge
Simple merge