From: Lyberta <lyberta@lyberta.net>
Date: Fri, 7 Apr 2017 01:13:00 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=1c4ad441269dd7ca2b241258e9ea878ce94301bc;p=xonotic%2Fxonotic-data.pk3dir.git

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

1c4ad441269dd7ca2b241258e9ea878ce94301bc