]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3437fdc 64c85ae)
Merge remote-tracking branch 'origin/master' into packer/vorix
authorpacker <packer@local>
Sun, 21 Feb 2016 18:48:04 +0000 (19:48 +0100)
committerpacker <packer@local>
Sun, 21 Feb 2016 18:48:04 +0000 (19:48 +0100)

Trivial merge