From: terencehill Date: Sun, 31 Jan 2016 11:21:28 +0000 (+0100) Subject: Merge branch 'master' into terencehill/weaponmodel_effects_2 X-Git-Tag: xonotic-v0.8.2~1190^2~6 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cd3d62397dfaa03707d6b273538e8ce0157fbde9;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/weaponmodel_effects_2 --- cd3d62397dfaa03707d6b273538e8ce0157fbde9