From: Lyberta <lyberta@lyberta.net>
Date: Fri, 16 Feb 2018 11:20:03 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=794cef11bc001b2ba8704bcd6d997d915be5b42d;p=xonotic%2Fxonotic-data.pk3dir.git

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

794cef11bc001b2ba8704bcd6d997d915be5b42d