From: drjaska <drjaska83@gmail.com>
Date: Fri, 2 Dec 2022 15:09:28 +0000 (+0200)
Subject: Merge branch 'master' into drjaska/classic-weapon
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fdrjaska%2Fclassic-weapon;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into drjaska/classic-weapon
---

8b46ef7c5a07eef90f07d376f0fd8aa05e6cb891