From: Mircea Kitsune Date: Sun, 10 Apr 2011 16:22:08 +0000 (+0300) Subject: Merge branch 'master' into mirceakitsune/damage_effects X-Git-Tag: xonotic-v0.6.0~110^2^2~117 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3f59fe8b606a41c772fd053c127199f0808b06f4;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/damage_effects --- 3f59fe8b606a41c772fd053c127199f0808b06f4