]> 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 | combined (merge: 208ff8c aab0569)
Merge branch 'Mirio/mapinfos'
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 00:41:39 +0000 (01:41 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 00:41:39 +0000 (01:41 +0100)

Trivial merge