From: Mario <mario@smbclan.net>
Date: Wed, 10 Oct 2018 03:15:54 +0000 (+1000)
Subject: Merge branch 'Mario/cts_killprojectiles'
X-Git-Tag: xonotic-v0.8.5~1787
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=2fc1af01873c8e3a34b934fcd11061842d191bf5;hp=-c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/cts_killprojectiles'
---

2fc1af01873c8e3a34b934fcd11061842d191bf5