From: terencehill <piuntn@gmail.com>
Date: Sun, 10 Oct 2021 08:29:30 +0000 (+0000)
Subject: Merge branch 'terencehill/weapon_origin_fix' into 'master'
X-Git-Tag: xonotic-v0.8.5~323
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cb1bf443709836b6decad82a41bed204776609a5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/weapon_origin_fix' into 'master'

Fix #694 and fix #1902

Closes #1902 and #694

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

cb1bf443709836b6decad82a41bed204776609a5