]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 54a94b6 693052a)
Merge branch 'bones_was_here/tourney_timeout' into 'master'
authorMario <mario.mario@y7mail.com>
Mon, 15 Jun 2020 09:01:56 +0000 (09:01 +0000)
committerMario <mario.mario@y7mail.com>
Mon, 15 Jun 2020 09:01:56 +0000 (09:01 +0000)
Enable timeouts in tourney mode

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


Trivial merge