From: Mario <zacjardine@y7mail.com>
Date: Sun, 18 Aug 2019 08:10:48 +0000 (+0000)
Subject: Merge branch 'Mario/glx_build' into 'master'
X-Git-Tag: xonotic-v0.8.5~133
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09e7fefb4af9ecc1711c03ffdf4ef83dc761dc62;p=xonotic%2Fxonotic.git

Merge branch 'Mario/glx_build' into 'master'

Merge branch Mario/glx_build (M merge request)

See merge request xonotic/xonotic!53
---

09e7fefb4af9ecc1711c03ffdf4ef83dc761dc62