From: Mircea Kitsune Date: Wed, 4 Jan 2012 12:47:29 +0000 (+0200) Subject: Merge branch 'master' into mirceakitsune/damage_effects X-Git-Tag: xonotic-v0.6.0~110^2^2~81 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c4b09062e3dc4b40cd17bc7658e8a21043abb66b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into mirceakitsune/damage_effects --- c4b09062e3dc4b40cd17bc7658e8a21043abb66b