]> 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: cbd3bd2 24426c3)
Merge remote-tracking branch 'origin/divVerent/fix-mutator-ctf-warpzones'
authorSamual Lenks <samual@xonotic.org>
Tue, 18 Sep 2012 14:30:44 +0000 (10:30 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 18 Sep 2012 14:30:44 +0000 (10:30 -0400)

Trivial merge