Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 29 Apr 2013 01:22:28 +0000 (21:22 -0400)
commit27e0dcee207c9b4ab3e36bde11dee4dcb260bd13
tree93ff39006d635f296dd45fe787a942a6bd6cd615
parentf00dd29e71e236ddd2d79f44256ff589cbeac350
parent0ee28e07a9b549802219bea01852416e7d622e60
Merge remote-tracking branch 'origin/Mario/domination_waypoint_fix'