]> 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: c37cec3 2a2f3b8)
Merge branch 'master' into matthiaskrgr/unsealedtrial3
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 10 Dec 2013 23:04:54 +0000 (00:04 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 10 Dec 2013 23:04:54 +0000 (00:04 +0100)

Trivial merge