]> git.xonotic.org Git - xonotic/xonotic.wiki.git/commitdiff
projects / xonotic / xonotic.wiki.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6fd5a60 156fffb)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 10 Feb 2017 00:22:34 +0000 (01:22 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 10 Feb 2017 00:22:34 +0000 (01:22 +0100)

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