From: Mircea Kitsune Date: Thu, 7 Apr 2011 21:41:25 +0000 (+0300) Subject: Merge branch 'master' into mirceakitsune/damage_effects X-Git-Tag: xonotic-v0.6.0~110^2^2~127 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=73f33a997a4499bdc04d1f8bd244d02856adfcbd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/damage_effects --- 73f33a997a4499bdc04d1f8bd244d02856adfcbd