From: Mario <zacjardine@y7mail.com>
Date: Mon, 24 Sep 2018 12:46:44 +0000 (+0000)
Subject: Merge branch 'packer/dmg-and-ca-scoring' into 'master'
X-Git-Tag: xonotic-v0.8.5~1832
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e36b06a3a00d528d59385af3e9510b7b7f7188ac;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'packer/dmg-and-ca-scoring' into 'master'

fix dmg and ca scoring

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

e36b06a3a00d528d59385af3e9510b7b7f7188ac