]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commit
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)
commitc948aded0eeb44e007817be5053277270c174ad6
tree7137f6493ae88c62a0a9acbe1fab994884c7c569
parentce1989ebcbd4d4f44b8ca07162e89345f3e398a8
parenta6bc80038b1fe7f63ac2cab39fd6b927053e7803
Merge branch 'master' into matthiaskrgr/geoplanetary