From: Mario <zacjardine@y7mail.com>
Date: Thu, 31 May 2018 06:18:25 +0000 (+0000)
Subject: Merge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'
X-Git-Tag: xonotic-v0.8.5~2119
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a9e844946a028906d822bdeb344a7fef85dc2dab;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/StandaloneOverkillWeapons' into 'master'

Standalone Overkill weapons

See merge request xonotic/xonotic-data.pk3dir!461
---

a9e844946a028906d822bdeb344a7fef85dc2dab