Merge branch 'terencehill/waypoint_on_items' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 10 Aug 2019 17:53:50 +0000 (17:53 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 10 Aug 2019 17:53:50 +0000 (17:53 +0000)
commit4cbbb9ff3218072895e7ef3f9a28c739f0cba700
treea539586d7b251ce3502ec476732266e2e0456312
parentc0da0483d9d8ecb47bb6fd431b15407ba5ae9ae1
parent7208e70ef4cfe437e45e4f83a9bcd0f609e0b988
Merge branch 'terencehill/waypoint_on_items' into 'master'

Waypoint on items

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