From: terencehill Date: Sat, 5 Sep 2015 10:42:06 +0000 (+0200) Subject: Merge branch 'master' into terencehill/slider_anim_improvements X-Git-Tag: xonotic-v0.8.2~1890^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28305c2245f99ca5ae21ea8858e05c6bb0a2000b;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/slider_anim_improvements --- 28305c2245f99ca5ae21ea8858e05c6bb0a2000b