From: Lyberta <lyberta@lyberta.net>
Date: Thu, 5 Apr 2018 03:10:51 +0000 (+0300)
Subject: Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
X-Git-Tag: xonotic-v0.8.5~2119^2~15
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1d96f1ba683493a34bd036c1890bb93383793457;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Lyberta/StandaloneOverkillWeapons
---

1d96f1ba683493a34bd036c1890bb93383793457