]> 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 | compact (merge: 7c54550 ef5671d)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir
authorMario <mario@smbclan.net>
Sat, 11 Mar 2017 22:13:45 +0000 (08:13 +1000)
committerMario <mario@smbclan.net>
Sat, 11 Mar 2017 22:13:45 +0000 (08:13 +1000)

Trivial merge