]> 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: 26898c0 183f0c1)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-maps.pk3dir into...
authorMaddin <mjschwan@gmx.de>
Sat, 8 Oct 2016 13:22:52 +0000 (15:22 +0200)
committerMaddin <mjschwan@gmx.de>
Sat, 8 Oct 2016 13:22:52 +0000 (15:22 +0200)

Trivial merge