]> 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: 565a952 6b188d6)
Merge remote-tracking branch 'origin/terencehill/MOTD_bugfix'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:30:10 +0000 (16:30 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:30:10 +0000 (16:30 -0400)

Trivial merge