]> 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: 9236e98 98336a9)
Merge branch 'matthiaskrgr/glowplant' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:23:36 +0000 (16:23 +0000)
committerMirio <opivy@hotmail.de>
Mon, 13 Mar 2017 16:23:36 +0000 (16:23 +0000)
Matthiaskrgr/glowplant misc changes/fix light

See merge request !81


Trivial merge