]> 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: 98e1ad7 d0a0e35)
Merge branch 'master' of ssh://gitlab.com/xonotic/xonotic-maps.pk3dir
authorMirio <opivy@hotmail.de>
Mon, 23 Feb 2015 23:38:45 +0000 (00:38 +0100)
committerMirio <opivy@hotmail.de>
Mon, 23 Feb 2015 23:38:45 +0000 (00:38 +0100)

Trivial merge