From: Martin Taibr <taibr.martin@gmail.com>
Date: Sat, 18 Jan 2020 14:36:36 +0000 (+0000)
Subject: Merge branch 'martin-t/electro-denoobing' into 'master'
X-Git-Tag: xonotic-v0.8.5~1161^2~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0257ecb2eed69a4d4e871a51f1ccb4afc1bcdf1a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/electro-denoobing' into 'master'

Electro: midair combos

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

0257ecb2eed69a4d4e871a51f1ccb4afc1bcdf1a