Merge branch 'master' into issue_1089
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 2 Dec 2016 13:31:18 +0000 (14:31 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 2 Dec 2016 13:31:18 +0000 (14:31 +0100)
commit769805efd0a7ec7eb648fe8ccf1a8895091a4486
tree517140edd466f5b87f46d879d00f3ffd409ec691
parentdcfc696e86736a3b869a3efe0e64e09f13609040
parentc46ac37c9bda1754bbcc23b2c0fb48f65e076843
Merge branch 'master' into issue_1089
test/CMakeLists.txt