]> 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: 95f5189 d6527fb)
Merge branch 'master' into Spike29/tutorial_campaign
authorSpike29 <leguen.yannick@gmail.com>
Sat, 1 Jun 2019 11:19:22 +0000 (13:19 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Sat, 1 Jun 2019 11:19:22 +0000 (13:19 +0200)

Trivial merge