From: Mario <mario.mario@y7mail.com>
Date: Sun, 1 Sep 2019 04:27:03 +0000 (+0000)
Subject: Merge branch 'martin-t/ok-balances' into 'master'
X-Git-Tag: xonotic-v0.8.5~1335
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8afb8e653aa9e1bfb1f1cb12b424e97f16c40528;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/ok-balances' into 'master'

Sync OK configs to minimize modified cvars

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

8afb8e653aa9e1bfb1f1cb12b424e97f16c40528