From: Rudolf Polzer Date: Wed, 29 Feb 2012 09:45:00 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/mirceakitsune/bugfix_impact_effects' X-Git-Tag: xonotic-v0.6.0~42 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f853aab9b6637084b9017964716af009b4aeb9a2;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/mirceakitsune/bugfix_impact_effects' --- f853aab9b6637084b9017964716af009b4aeb9a2