]> 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: 0205b0c 42b070b)
Merge branch 'Mirio/glowplant'
authorMirio <opivy@hotmail.de>
Thu, 12 Feb 2015 10:32:48 +0000 (11:32 +0100)
committerMirio <opivy@hotmail.de>
Thu, 12 Feb 2015 10:32:48 +0000 (11:32 +0100)

Trivial merge