From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 12:16:44 +0000 (+1000)
Subject: Merge branch 'TimePath/cmake'
X-Git-Tag: xonotic-v0.8.2~959
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3b67eac43c0d85efc59129587aa71d565c9e9aea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'TimePath/cmake'
---

3b67eac43c0d85efc59129587aa71d565c9e9aea