From: Lyberta <lyberta@lyberta.net>
Date: Wed, 16 Aug 2017 03:10:50 +0000 (+0300)
Subject: Merged master into Lyberta/StandaloneOverkillWeapons.
X-Git-Tag: xonotic-v0.8.5~2119^2~60
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ee5353529c2fee304ac944aa19af53cc85eca7b0;p=xonotic%2Fxonotic-data.pk3dir.git

Merged master into Lyberta/StandaloneOverkillWeapons.
---

ee5353529c2fee304ac944aa19af53cc85eca7b0