From: Mario <zacjardine@y7mail.com>
Date: Mon, 17 Sep 2018 01:20:08 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Tag: xonotic-v0.8.5~1854
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=70c6877a4855fd33d87df7e22eae1c8a3b6a6b28;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into 'master'

Increase the Input packets/s menu option max value to 180

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

70c6877a4855fd33d87df7e22eae1c8a3b6a6b28