From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 14 Apr 2016 04:21:46 +0000 (+1000)
Subject: Merge branch 'TimePath/cmake'
X-Git-Tag: xonotic-v0.8.2~24
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=8d73b1dcef03cb43c24244c62a72c44e415be067;hp=4e3a68ee0d03f41a839403003225dcfaa8ca63ec

Merge branch 'TimePath/cmake'
---