]> 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: 8ea2862 983e2bc)
Merge branch 'matthiaskrgr/implosion' into matthiaskrgr/srgb
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 08:21:13 +0000 (10:21 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 31 Aug 2015 08:21:13 +0000 (10:21 +0200)

Trivial merge