From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 14 Jan 2012 10:24:26 +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~24
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=b9892287df60503128fd17f1be8289b44243e179;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
---

b9892287df60503128fd17f1be8289b44243e179