]> 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 | compact (merge: 4c5d74b 8977c19)
Merge branch 'master' into mirio/geoplanetary
authorMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)
committerMirio <opivy@hotmail.de>
Wed, 3 Dec 2014 23:06:00 +0000 (00:06 +0100)

Trivial merge