Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:28:33 +0000 (20:28 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 17 Aug 2019 18:28:33 +0000 (20:28 +0200)
commitca9f533b1a28ea7648da1df2c6548f11675d2bc1
tree6729e77ffb654f8f3c9cd155a18a261a2e250be8
parentb7a912e0d583bac6e4aed67a70045d2924a0aff9
parent3c1e56f26fd675c3606d34b3afa94e3889ff4350
Merge branch 'master' into martin-t/ok-config and remove workaround from ruleset cfg
bal-wep-xonotic.cfg
ruleset-overkill.cfg