]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55f8742 026dde2)
Merge remote-tracking branch 'origin/terencehill/ca_arena_mutators'
authorSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:14:10 +0000 (01:14 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 7 May 2013 05:14:10 +0000 (01:14 -0400)

Trivial merge