From: Mircea Kitsune Date: Mon, 9 Jan 2012 15:41:30 +0000 (+0200) Subject: Merge branch 'master' into mirceakitsune/damage_effects X-Git-Tag: xonotic-v0.6.0~110^2^2~40 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=852f80e8f4d65a7a6b57e0790036e09db6051409;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/damage_effects --- 852f80e8f4d65a7a6b57e0790036e09db6051409