]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e57d52 b9591a4)
Merge branch 'master' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Fri, 28 Aug 2015 16:44:51 +0000 (18:44 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Fri, 28 Aug 2015 16:44:51 +0000 (18:44 +0200)

Trivial merge