]> 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: 9a2422e 095f85f)
Merge branch 'Mirio/map_updates'
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:24:21 +0000 (04:24 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 17:24:21 +0000 (04:24 +1100)

Trivial merge