]> de.git.xonotic.org Git - xonotic/xonotic.wiki.git/commitdiff
projects / xonotic / xonotic.wiki.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a171494 09d653f)
Merge remote-tracking branch 'origin/master'
authorRudolf Polzer <divverent@xonotic.org>
Tue, 2 Sep 2014 07:42:25 +0000 (09:42 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 2 Sep 2014 07:42:25 +0000 (09:42 +0200)

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