]> 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: 8ab8a5a f00dd29)
Merge remote-tracking branch 'origin/master' into Mario/domination_waypoint_fix
authorSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:20:03 +0000 (21:20 -0400)

Trivial merge