From: Mario <zacjardine@y7mail.com>
Date: Mon, 16 Jul 2018 04:41:22 +0000 (+0000)
Subject: Merge branch 'Lyberta/TeamplayOverhaul' into 'master'
X-Git-Tag: xonotic-v0.8.5~1953
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=aa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Lyberta/TeamplayOverhaul' into 'master'

Teamplay overhaul - step 1

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

aa1c87cd3f79ddaf4e45ebf9428293cfdf2d6733