From: Severin Meyer Date: Sat, 8 Oct 2016 13:03:52 +0000 (+0200) Subject: Merge branch 'master' of gitlab.com:xonotic/mediasource into sev/hud_ctf_update X-Git-Tag: xonotic-v0.8.2~6^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F11%2Fhead;p=xonotic%2Fmediasource.git Merge branch 'master' of gitlab.com:xonotic/mediasource into sev/hud_ctf_update --- cd7f294cdda97b9ed2a65d3062ce856fe57b37d7