]> git.xonotic.org Git - xonotic/xonotic.wiki.git/commitdiff
projects / xonotic / xonotic.wiki.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7f40803 002ea58)
Merge branch 'master' into martin-t/cleanup
authorMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Wed, 22 Mar 2017 18:55:22 +0000 (19:55 +0100)

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