From: Lyberta <lyberta@lyberta.net>
Date: Mon, 4 Dec 2017 18:29:04 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1be4f118b306ece2942bd35e6dc9af73aedb2eaa;p=xonotic%2Fxonotic-data.pk3dir.git

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

1be4f118b306ece2942bd35e6dc9af73aedb2eaa