From: terencehill <piuntn@gmail.com>
Date: Fri, 17 Aug 2018 18:08:23 +0000 (+0000)
Subject: Merge branch 'byteManiak/types' into 'master'
X-Git-Tag: xonotic-v0.8.5~1925
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f07f47fa93fb083cb44cba05a614b91b6ae9211;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'byteManiak/types' into 'master'

Data types

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

4f07f47fa93fb083cb44cba05a614b91b6ae9211