]> de.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: 85f869a 086ab0c)
Merge branch 'martin-t/votefix' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 20 Sep 2017 18:11:22 +0000 (18:11 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 20 Sep 2017 18:11:22 +0000 (18:11 +0000)
Fix vote timing out when none is called

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


Trivial merge