From: Lyberta <lyberta@lyberta.net>
Date: Wed, 16 Aug 2017 05:04:33 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e83b6c4673987785d758cba134ac1bd17028bb8;p=xonotic%2Fxonotic-data.pk3dir.git

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

0e83b6c4673987785d758cba134ac1bd17028bb8