Merge remote-tracking branch 'origin/master' into develop

2017-02-06 20:29:21 -05:00
parent 26fdb19344 44c58a66d1
commit 7db7747cb0
28 changed files with 4179 additions and 1648 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -92,6 +92,7 @@ set(TEST_LIBRARIES
    Qt5::Widgets
    Qt5::Test
    ${GCRYPT_LIBRARIES}
+    ${GPGERROR_LIBRARIES}
    ${ZLIB_LIBRARIES}
 )