]> 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: 82f0758 bde550d)
Merge branch 'maddin/map-warfare-updates'
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:38:09 +0000 (00:38 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:38:09 +0000 (00:38 +0200)

Trivial merge