]> git.rm.cloudns.org Git - xonotic/xonotic.wiki.git/commitdiff
projects / xonotic / xonotic.wiki.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0247c28 26674e5)
Merge branch 'master' of gitlab.com:xonotic/xonotic.wiki
authorRudolf Polzer <divverent@xonotic.org>
Fri, 10 Oct 2014 09:52:35 +0000 (11:52 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 10 Oct 2014 09:52:35 +0000 (11:52 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.