]> 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: e8ee733 9dbd16c)
Merge branch 'master' into matthiaskrgr/unsealedtrial3
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 27 Oct 2013 13:45:26 +0000 (14:45 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 27 Oct 2013 13:45:26 +0000 (14:45 +0100)

Trivial merge