]> 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 | compact (merge: 30c1f5c 3c9bdd5)
Merge remote branch 'origin/diabolik/more-lavacolors'
authortzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)
committertzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)

Trivial merge