]> 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: 24925f6 3b999c0)
Merge branch 'master' into Spike29/tutorial_visuals
authorYannick Le Guen <leguen.yannick@gmail.com>
Thu, 14 Dec 2017 17:33:13 +0000 (18:33 +0100)
committerYannick Le Guen <leguen.yannick@gmail.com>
Thu, 14 Dec 2017 17:33:13 +0000 (18:33 +0100)

Trivial merge