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