Merge branch 'Mario/balance_configs' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:16:11 +0000 (19:16 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:16:11 +0000 (19:16 +0000)
commit0ba71dc570e81c28d76967aa31aff3138a713559
tree03048a042a0bd5d3e25ecf6a89284aa35ae9dbd4
parent9c18b3f95143f4d1c4945e33c7e1649dbcb61ca2
parentc5e89ce5019793e0b97729769d874ac54cc04e1a
Merge branch 'Mario/balance_configs' into 'master'

Merge branch Mario/balance_configs (S merge request)

See merge request xonotic/xonotic-data.pk3dir!680
bal-wep-mario.cfg