]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c7cba55 2c0404c)
Merge remote-tracking branch 'origin/Mario/vote_mapchange_fix'
authorSamual Lenks <samual@xonotic.org>
Sun, 30 Dec 2012 16:16:46 +0000 (11:16 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 30 Dec 2012 16:16:46 +0000 (11:16 -0500)

Trivial merge