From: Mario <mario.mario@y7mail.com>
Date: Mon, 6 Jan 2020 17:41:25 +0000 (+0000)
Subject: Merge branch 'Mario/weapon_opacity_menu' into 'master'
X-Git-Tag: xonotic-v0.8.5~1105^2~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a6d73d3744336f48f98ef72488c63b62a5a61b17;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/weapon_opacity_menu' into 'master'

Merge branch Mario/weapon_opacity_menu (S merge request)

Closes #2371

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

a6d73d3744336f48f98ef72488c63b62a5a61b17