]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a861a69 5b28382)
Merge branch 'maddin/map-warfare'
authorMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:04:04 +0000 (21:04 +0200)
committerMirio <opivy@hotmail.de>
Thu, 9 Jul 2015 19:04:04 +0000 (21:04 +0200)

Trivial merge