]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 1fac1c4 c50029d)
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)
Oxygen bar

Closes #2393

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


Trivial merge