]> 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: 5466438 d7939f4)
Merge branch 'Mirio/darkzone'
authorMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:37:57 +0000 (17:37 +0100)
committerMirio <opivy@hotmail.de>
Fri, 3 Mar 2017 16:37:57 +0000 (17:37 +0100)

Trivial merge