]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e11a031 e41d94d)
Merge remote-tracking branch 'origin/Mario/domination_mutator'
authorSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 22:01:58 +0000 (17:01 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 22:01:58 +0000 (17:01 -0500)

Trivial merge