From: Mario <mario.mario@y7mail.com>
Date: Mon, 15 Jun 2020 09:01:56 +0000 (+0000)
Subject: Merge branch 'bones_was_here/tourney_timeout' into 'master'
X-Git-Tag: xonotic-v0.8.5~914
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a564d629ed29219cd4e7f250f04e90665a36754a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'bones_was_here/tourney_timeout' into 'master'

Enable timeouts in tourney mode

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

a564d629ed29219cd4e7f250f04e90665a36754a