]> 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: 7707fea c73b76c)
Merge branch 'Mario/gametype_votes'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 13:41:03 +0000 (00:41 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 13:41:03 +0000 (00:41 +1100)

Trivial merge