]> 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: b95f0ec 140c957)
Merge branch 'master' into matthiaskrgr/space-elevator_autoSC_ent
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 2 Jun 2013 21:19:15 +0000 (23:19 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 2 Jun 2013 21:19:15 +0000 (23:19 +0200)

Trivial merge