Merge branch 'sev/hud_ctf_update' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 8 Oct 2016 16:29:28 +0000 (16:29 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 8 Oct 2016 16:29:28 +0000 (16:29 +0000)
commit668781d6492901f6b860a8e7c3a5857a286f1b99
tree47d707b14164a664b1b734c9b7fdd98d552cda0f
parente9f1f96c63f6397e198d191c11b7789622bc238a
parentcd7f294cdda97b9ed2a65d3062ce856fe57b37d7
Merge branch 'sev/hud_ctf_update' into 'master'

Sources of CTF stalemate images

For merge xonotic/xonotic-data.pk3dir!338

See merge request !11