From: Mario <zacjardine@y7mail.com>
Date: Sat, 10 Aug 2019 17:53:50 +0000 (+0000)
Subject: Merge branch 'terencehill/waypoint_on_items' into 'master'
X-Git-Tag: xonotic-v0.8.5~1414
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4cbbb9ff3218072895e7ef3f9a28c739f0cba700;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/waypoint_on_items' into 'master'

Waypoint on items

See merge request xonotic/xonotic-data.pk3dir!672
---

4cbbb9ff3218072895e7ef3f9a28c739f0cba700