]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b79e5fa 31f0ca0)
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)
Merge branch Mario/weapon_opacity_menu (S merge request)

Closes #2371

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


Trivial merge