From: Lyberta Date: Fri, 17 Mar 2017 20:13:19 +0000 (+0300) Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons X-Git-Tag: xonotic-v0.8.5~2119^2~82 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=c8988d346ff2d4aaa0f2147d72416b88f328c328 Merge branch 'master' into Lyberta/StandaloneOverkillWeapons --- c8988d346ff2d4aaa0f2147d72416b88f328c328