]> 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: 1a1250b af7ea5d)
Merge branch 'Mirio/mapfixes'
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:21:59 +0000 (00:21 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:21:59 +0000 (00:21 +0100)

Trivial merge