From: Lyberta <lyberta@lyberta.net>
Date: Mon, 30 Apr 2018 21:56:47 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ba6a84d0b9f154158ea038085d56f11e4af268ff;p=xonotic%2Fxonotic-data.pk3dir.git

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

ba6a84d0b9f154158ea038085d56f11e4af268ff