From: Lyberta Date: Thu, 29 Jun 2017 11:52:57 +0000 (+0300) Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons X-Git-Tag: xonotic-v0.8.5~2119^2~65 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=acddeee8ad8acd0099fdd25d5049e302d6246f24 Merge branch 'master' into Lyberta/StandaloneOverkillWeapons --- acddeee8ad8acd0099fdd25d5049e302d6246f24