Merge branch 'martin-t/electro-denoobing' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
Electro: midair combos

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

1  2 
bal-wep-testing.cfg
bal-wep-xonotic.cfg

Simple merge
Simple merge