From: Mario <mario.mario@y7mail.com>
Date: Wed, 18 Nov 2020 21:58:23 +0000 (+0000)
Subject: Merge branch 'sev/xolonium4_2' into 'master'
X-Git-Tag: xonotic-v0.8.5~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=383b0a78d94bde24f50cfb53c69e37245b152514;p=xonotic%2Fmediasource.git

Merge branch 'sev/xolonium4_2' into 'master'

Update Xolonium sources to version 4.2

See merge request xonotic/mediasource!16
---

383b0a78d94bde24f50cfb53c69e37245b152514