Merge pull request #350 from cheshirekow/cmake_build
authortexane <texane@gmail.com>
Fri, 20 Nov 2015 16:53:56 +0000 (17:53 +0100)
committertexane <texane@gmail.com>
Fri, 20 Nov 2015 16:53:56 +0000 (17:53 +0100)
Cmake build


Trivial merge