From: Mario <mario.mario@y7mail.com>
Date: Wed, 3 Jun 2020 08:36:21 +0000 (+1000)
Subject: Merge branch 'master' into Mario/nexcompat_weaponswap
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2FMario%2Fnexcompat_weaponswap;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/nexcompat_weaponswap
---

d2810235220d0f95a4e51b19cb08c6ff5aea2f3d