]> git.xonotic.org Git - xonotic/mediasource.git/commitdiff
projects / xonotic / mediasource.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9f1f96 cd7f294)
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)
Sources of CTF stalemate images

For merge xonotic/xonotic-data.pk3dir!338

See merge request !11


Trivial merge