]> 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: e6bb286 f280403)
Merge remote-tracking branch 'origin/Mario/mutators'
authorSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 21:58:07 +0000 (17:58 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 21:58:07 +0000 (17:58 -0400)

Trivial merge