]> 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: 92cbe2f 1601b17)
Merge branch 'Spike29/tutorial_level1' into Spike29/tutorial_campaign
authorSpike29 <leguen.yannick@gmail.com>
Mon, 5 Aug 2019 16:41:39 +0000 (18:41 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Mon, 5 Aug 2019 16:41:39 +0000 (18:41 +0200)

Trivial merge