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