Commit 6401e2d8 authored by Carsten Kemena's avatar Carsten Kemena

Merge branch 'develop-ck' into 'master'

switching back to cmake 2.8 for time beeing

See merge request !15
parents 6758aa06 3aa6e839
Pipeline #627 passed with stages
in 3 minutes and 23 seconds