]> 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: 656acca 684284b)
Merge branch 'master' into matthiaskrgr/unsealedtrial3
authorMatthias Krüger <matthias.krueger@famsik.de>
Tue, 1 Sep 2015 17:57:41 +0000 (19:57 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Tue, 1 Sep 2015 17:57:41 +0000 (19:57 +0200)

Trivial merge