]> 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: 10abbd7 5c8503d)
Merge remote branch 'origin/morphed/exomorphx-alphashadowfix'
authorSamual <samual@xonotic.org>
Tue, 28 Feb 2012 21:51:49 +0000 (16:51 -0500)
committerSamual <samual@xonotic.org>
Tue, 28 Feb 2012 21:51:49 +0000 (16:51 -0500)

Trivial merge