]> 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: 1e3da5e 9dbd16c)
Merge branch 'master' into matthiaskrgr/dance
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 12 Nov 2013 07:07:43 +0000 (08:07 +0100)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 12 Nov 2013 07:07:43 +0000 (08:07 +0100)

Trivial merge