]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 74d0f88 4e5de52)
Merge remote branch 'origin/terencehill/megaerebus_image_fix'
authorSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)
committerSamual <samual@xonotic.org>
Mon, 12 Sep 2011 06:30:27 +0000 (02:30 -0400)

Trivial merge