]> 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: 1764a3a 14d35ac)
Merge branch 'master' into Mirio/darkzone
authorMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:32:48 +0000 (00:32 +0200)
committerMirio <opivy@hotmail.de>
Tue, 25 Oct 2016 22:32:48 +0000 (00:32 +0200)

Trivial merge