From: terencehill <piuntn@gmail.com>
Date: Sun, 11 Sep 2022 21:26:15 +0000 (+0000)
Subject: Merge branch 'Mario/nade_orb_overlay' into 'master'
X-Git-Tag: xonotic-v0.8.6~366
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d126fd4da497fb8c7cbd5939ed9c6ee07cd2df9c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/nade_orb_overlay' into 'master'

Merge branch Mario/nade_orb_overlay  (S merge request)

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

d126fd4da497fb8c7cbd5939ed9c6ee07cd2df9c