Merge branch 'develop' into feature/yubikey

This commit is contained in:
Janek Bevendorff
2017-02-15 00:24:28 +01:00
90 changed files with 6467 additions and 1685 deletions

View File

@@ -92,6 +92,7 @@ set(TEST_LIBRARIES
Qt5::Widgets
Qt5::Test
${GCRYPT_LIBRARIES}
${GPGERROR_LIBRARIES}
${ZLIB_LIBRARIES}
)