]> 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: 8cedf0c 7ddcceb)
Merge remote-tracking branch 'origin/master' into samual/serverlist
authorRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 05:21:21 +0000 (07:21 +0200)

Trivial merge