Merge branch 'Mario/weapon_opacity_menu' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 6 Jan 2020 17:41:25 +0000 (17:41 +0000)
commita6d73d3744336f48f98ef72488c63b62a5a61b17
treee47467800f629a705e503304a5661964b1cfc708
parentb79e5fa2baaf40b20883d519ff980f29d1a4966b
parent31f0ca0b52c23fc560a592a4ebafdf85c8890419
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