From: Mario <zacjardine@y7mail.com>
Date: Sun, 12 Mar 2017 15:36:00 +0000 (+0000)
Subject: Merge branch 'Mario/race_target_waypoint' into 'master'
X-Git-Tag: xonotic-v0.8.2~70
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0096c40fc19ace661666a2761c04b6dcea736c37;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/race_target_waypoint' into 'master'

Merge branch Mario/race_target_waypoint (S merge request)

See merge request !421
---

0096c40fc19ace661666a2761c04b6dcea736c37