From: Mario <mario.mario@y7mail.com>
Date: Sun, 18 Oct 2020 22:41:19 +0000 (+1000)
Subject: Merge branch 'master' into mirceakitsune/new_shotgun_uzi
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmirceakitsune%2Fnew_shotgun_uzi;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mirceakitsune/new_shotgun_uzi
---

2310207e9943ed17f8bbb6112222af1df08300c2