]> 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: 78ca4af bf4ae81)
Merge remote-tracking branch 'origin/Mirio/runningmanctf'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 16:12:58 +0000 (12:12 -0400)

Trivial merge