]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9cb32f 8c36802)
Merge branch 'Spike29/tutorial_level1' into Spike29/tutorial_campaign
authorSpike29 <leguen.yannick@gmail.com>
Fri, 19 Oct 2018 12:13:39 +0000 (14:13 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Fri, 19 Oct 2018 12:13:39 +0000 (14:13 +0200)

Trivial merge