]> 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: 6898281 1cb648c)
Merge branch 'master' into Mirio/darkzone
authorMirio <opivy@hotmail.de>
Mon, 7 Nov 2016 11:26:05 +0000 (12:26 +0100)
committerMirio <opivy@hotmail.de>
Mon, 7 Nov 2016 11:26:05 +0000 (12:26 +0100)

Trivial merge