]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 722250f 61da535)
Merge remote branch 'origin/terencehill/mapping_update'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:04:17 +0000 (20:04 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:04:17 +0000 (20:04 -0500)

Trivial merge