From: Mario <zacjardine@y7mail.com>
Date: Wed, 26 Sep 2018 06:23:54 +0000 (+0000)
Subject: Merge branch 'Mario/warmup_timer' into 'master'
X-Git-Tag: xonotic-v0.8.5~1829
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=31cefbf89224b89cec59dc8c54ea4cdc4c4b870b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/warmup_timer' into 'master'

Merge branch Mario/warmup_timer (XXS merge request)

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

31cefbf89224b89cec59dc8c54ea4cdc4c4b870b