]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: f00dd29 0ee28e0)
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)

Trivial merge