Merge branch 'terencehill/oxygen_bar' into 'master'
authorMario <mario.mario@y7mail.com>
Tue, 24 Mar 2020 13:52:05 +0000 (13:52 +0000)
committerMario <mario.mario@y7mail.com>
Tue, 24 Mar 2020 13:52:05 +0000 (13:52 +0000)
commita1267116f537f5e1af48cbcb14448738fb7ed2ad
treeae9cef373080580425b7958083b4371f2a03611a
parent1fac1c4ab504cc6a6c0d4b3ca70ad0ee646fece9
parentc50029d5abdcccf570ca54a1840047a5b9476b7c
Merge branch 'terencehill/oxygen_bar' into 'master'

Oxygen bar

Closes #2393

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