From: terencehill <piuntn@gmail.com>
Date: Wed, 7 Feb 2018 16:31:55 +0000 (+0000)
Subject: Merge branch 'terencehill/techassault_waypoints' into 'master'
X-Git-Tag: xonotic-v0.8.5~135
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45d68e9485efd997e0d09a8be5b52055dbb1c3c5;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'terencehill/techassault_waypoints' into 'master'

Improve and update Techassault waypoints, they were broken
Campaign: re-enable Assault level since bots can play it

See merge request xonotic/xonotic-maps.pk3dir!112
---

45d68e9485efd997e0d09a8be5b52055dbb1c3c5