From: Mario <mario.mario@y7mail.com>
Date: Tue, 24 Mar 2020 13:52:05 +0000 (+0000)
Subject: Merge branch 'terencehill/oxygen_bar' into 'master'
X-Git-Tag: xonotic-v0.8.5~1144^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1267116f537f5e1af48cbcb14448738fb7ed2ad;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/oxygen_bar' into 'master'

Oxygen bar

Closes #2393

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

a1267116f537f5e1af48cbcb14448738fb7ed2ad