From: TimePath <andrew.hardaker1995@gmail.com>
Date: Tue, 13 Oct 2015 07:52:46 +0000 (+0000)
Subject: Merge branch 'TimePath/deathtypes' into 'master'
X-Git-Tag: xonotic-v0.8.2~1832
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bb4f10f1ed0f3d39e18c03a3db1dd7c8c74f14d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/deathtypes' into 'master'

Deathtypes: port to registry

Yet another merge request

See merge request !234
---

6bb4f10f1ed0f3d39e18c03a3db1dd7c8c74f14d