]> de.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: 9f005be ec47dd8)
Merge remote-tracking branch 'origin/master' into samual/serverlist
authorSamual Lenks <samual@xonotic.org>
Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 8 Oct 2013 16:25:36 +0000 (12:25 -0400)

Trivial merge