Merge branch 'Mario/glx_build' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 08:10:48 +0000 (08:10 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 18 Aug 2019 08:10:48 +0000 (08:10 +0000)
commit09e7fefb4af9ecc1711c03ffdf4ef83dc761dc62
treedc2ccd3f46b68bd46a0ef024a4993c71b2620460
parente712295d3442091ba7e03494e477cf820f73fe9b
parentb2ca5b5bdcb8e60d9601402d13e9ecec30628607
Merge branch 'Mario/glx_build' into 'master'

Merge branch Mario/glx_build (M merge request)

See merge request xonotic/xonotic!53