]> 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 | combined (merge: 67055d9 f458d59)
Merge branch 'Mario/wickedx_fix_v2' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:09:09 +0000 (05:09 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 24 Jun 2019 05:09:09 +0000 (05:09 +0000)
wickedx bg fix

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


Trivial merge