From: Mario <zacjardine@y7mail.com>
Date: Thu, 8 Feb 2018 00:18:05 +0000 (+0000)
Subject: Merge branch 'martin-t/powerups' into 'master'
X-Git-Tag: xonotic-v0.8.5~2341
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44583141c8a87415dc3bf3a9865da77d608b4585;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/powerups' into 'master'

Option to spawn quad and shield at the same time

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

44583141c8a87415dc3bf3a9865da77d608b4585