]> 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: ce1989e a6bc800)
Merge branch 'master' into matthiaskrgr/geoplanetary
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Sep 2015 21:05:47 +0000 (23:05 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 11 Sep 2015 21:05:47 +0000 (23:05 +0200)

Trivial merge