From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Mon, 16 Jan 2012 20:17:11 +0000 (+0200)
Subject: Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonot... 
X-Git-Tag: xonotic-v0.6.0~110^2^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2052921c213dadf1160c165d646d7158543d59c8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mirceakitsune/damage_effects' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/damage_effects
---

2052921c213dadf1160c165d646d7158543d59c8