]> 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: b71f6b2 1a1250b)
Merge branch 'master' into mirio/mapfixes
authorMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)
committerMirio <opivy@hotmail.de>
Mon, 9 Feb 2015 23:20:42 +0000 (00:20 +0100)

Trivial merge