]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a0bfb35 72817fa)
Merge branch 'Mario/ctf_fixes'
authorMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:02:53 +0000 (22:02 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 5 Dec 2014 11:02:53 +0000 (22:02 +1100)

Trivial merge