Merge with master
authorJerry Jacobs <jerry.jacobs@dualinventive.com>
Thu, 7 Apr 2016 11:01:32 +0000 (13:01 +0200)
committerJerry Jacobs <jerry.jacobs@dualinventive.com>
Thu, 7 Apr 2016 11:01:32 +0000 (13:01 +0200)
commitd9814ffe9a37301cd0bb0a74f7fe5e5308dd07e9
tree66d0acd59314c567216726e8ca199c5303502671
parent32807fb95080f3e500d2dbd64e319cc33577a658
parent3cd9cbb88cf75b8c660fec8bcb02d245151711af
Merge with master
CMakeLists.txt
README