From: Mario <mario@smbclan.net>
Date: Sat, 22 Sep 2018 21:50:12 +0000 (+1000)
Subject: Merge branch 'Mario/qcphysics'
X-Git-Tag: xonotic-v0.8.5~1838
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=80873aad4f268d4c1181baa7913d401ab1745d8a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/qcphysics'
---

80873aad4f268d4c1181baa7913d401ab1745d8a