From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 26 Jul 2015 10:23:48 +0000 (+1000)
Subject: Merge branch 'TimePath/cmake' into Melanosuchus/cmake
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b5d3254f4e796ffb41ed2af21dabaad1fdc6a29;p=xonotic%2Fnetradiant.git

Merge branch 'TimePath/cmake' into Melanosuchus/cmake
---

8b5d3254f4e796ffb41ed2af21dabaad1fdc6a29