]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 578365e c303237)
Merge branch 'Mario/release_nexcompat' into 'master'
authorMario <zacjardine@y7mail.com>
Mon, 19 Aug 2019 10:01:47 +0000 (10:01 +0000)
committerMario <zacjardine@y7mail.com>
Mon, 19 Aug 2019 10:01:47 +0000 (10:01 +0000)
Merge branch Mario/release_nexcompat (XS merge request)

Closes #219

See merge request xonotic/xonotic!55


Trivial merge