]> 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: abb1450 467b2f0)
Merge branch 'master' into Spike29/tutorial_visuals
authorYannick Le Guen <leguen.yannick@gmail.com>
Tue, 3 Oct 2017 16:33:15 +0000 (18:33 +0200)
committerYannick Le Guen <leguen.yannick@gmail.com>
Tue, 3 Oct 2017 16:33:15 +0000 (18:33 +0200)

Trivial merge