]> 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: b5fca2e 8f9e93c)
Merge branch 'master' into Spike29/tutorial_level1
authorSpike29 <leguen.yannick@gmail.com>
Tue, 18 Sep 2018 20:41:02 +0000 (22:41 +0200)
committerSpike29 <leguen.yannick@gmail.com>
Tue, 18 Sep 2018 20:41:02 +0000 (22:41 +0200)

Trivial merge