Merge branch 'cmake'
authorFelix Morgner <felix.morgner@gmail.com>
Tue, 14 Jan 2014 00:17:41 +0000 (01:17 +0100)
committerFelix Morgner <felix.morgner@gmail.com>
Tue, 14 Jan 2014 00:17:41 +0000 (01:17 +0100)
commitdbab0986ef78e0ee282f0a45a4c40e1dd6c26266
tree3c8174a71ed914a332de8156fa08b681a47bb4a4
parent673cad207cccf829038ab1a4399ca302bb0cf078
parentb440451fa83d7e6a2c881195255117f608699f79
Merge branch 'cmake'