]> 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: 60078c4 71d8c7e)
Merge branch 'master' into maddin/map-warfare-updates
authorMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)
committerMirio <opivy@hotmail.de>
Wed, 26 Oct 2016 22:37:10 +0000 (00:37 +0200)

Trivial merge