From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 2 Sep 2017 02:09:18 +0000 (+0000)
Subject: Merge branch 'martin-t/snt' into 'master'
X-Git-Tag: xonotic-v0.8.5~2485
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99b7900eda8efbe6e24a51667f5c50d0c179e614;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/snt' into 'master'

Disable SNT in ft and as

See merge request !480
---

99b7900eda8efbe6e24a51667f5c50d0c179e614