]> git.xonotic.org Git - xonotic/xonotic.wiki.git/commitdiff
projects / xonotic / xonotic.wiki.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c17239 afb3522)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic.wiki
authorBuddyFriendGuy <bfggeneral@gmail.com>
Thu, 7 Jul 2016 21:26:06 +0000 (17:26 -0400)
committerBuddyFriendGuy <bfggeneral@gmail.com>
Thu, 7 Jul 2016 21:26:06 +0000 (17:26 -0400)

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