]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e918cb 208ff8c)
Merge branch 'master' into mirio/glowplant
authorMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)
committerMirio <opivy@hotmail.de>
Fri, 23 Jan 2015 19:10:45 +0000 (20:10 +0100)

Trivial merge