From: Lyberta <lyberta@lyberta.net>
Date: Fri, 17 Mar 2017 16:34:21 +0000 (+0300)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into Lyberta/master
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=86a0a0a448aa7a7a835fa0bd686963b0ec9c6f16;p=xonotic%2Fxonotic-data.pk3dir.git

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

86a0a0a448aa7a7a835fa0bd686963b0ec9c6f16