]> 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: 7ea3d13 60312ab)
Merge remote-tracking branch 'origin/Mirio/red-planet'
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 21:15:00 +0000 (17:15 -0400)

Trivial merge