]> de.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: bd69480 b9cc27a)
Merge branch 'master' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 15:56:09 +0000 (17:56 +0200)

Trivial merge