From: Mario <zacjardine@y7mail.com>
Date: Mon, 19 Aug 2019 10:01:47 +0000 (+0000)
Subject: Merge branch 'Mario/release_nexcompat' into 'master'
X-Git-Tag: xonotic-v0.8.5~131
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=af56060eae553843f156d9018c577e4cec3ba8ae;p=xonotic%2Fxonotic.git

Merge branch 'Mario/release_nexcompat' into 'master'

Merge branch Mario/release_nexcompat (XS merge request)

Closes #219

See merge request xonotic/xonotic!55
---

af56060eae553843f156d9018c577e4cec3ba8ae