]> de.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: 65ad5cf 19f0771)
Merge branch 'master' of https://gitlab.com/xonotic/xonotic-maps.pk3dir
authorMario <mario@smbclan.net>
Wed, 7 Feb 2018 15:13:16 +0000 (01:13 +1000)
committerMario <mario@smbclan.net>
Wed, 7 Feb 2018 15:13:16 +0000 (01:13 +1000)

Trivial merge