]> 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: 68c5817 afa6950)
Merge branch 'master' into matthiaskrgr/dance_darker
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 26 Mar 2017 08:36:05 +0000 (10:36 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 26 Mar 2017 08:36:05 +0000 (10:36 +0200)

Trivial merge