]> 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: 8c36802 0da5595)
Merge branch 'master' into Spike29/tutorial_level1
authorSpike29 <leguen.yannick@gmail.com>
Sat, 2 Feb 2019 18:48:58 +0000 (19:48 +0100)
committerSpike29 <leguen.yannick@gmail.com>
Sat, 2 Feb 2019 18:48:58 +0000 (19:48 +0100)

Trivial merge