From: Mario <zacjardine@y7mail.com>
Date: Sat, 8 Oct 2016 16:29:28 +0000 (+0000)
Subject: Merge branch 'sev/hud_ctf_update' into 'master'
X-Git-Tag: xonotic-v0.8.2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=668781d6492901f6b860a8e7c3a5857a286f1b99;p=xonotic%2Fmediasource.git

Merge branch 'sev/hud_ctf_update' into 'master'

Sources of CTF stalemate images

For merge xonotic/xonotic-data.pk3dir!338

See merge request !11
---

668781d6492901f6b860a8e7c3a5857a286f1b99