Merge branch 'development' into LTS_development

# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Thulinma 2017-09-24 18:43:31 +02:00
commit 4b89f642d4

View file

@ -676,3 +676,4 @@ add_test(AESTest COMMAND aes_ctr128)
add_executable(urltest test/url.cpp ${BINARY_DIR}/mist/.headers) add_executable(urltest test/url.cpp ${BINARY_DIR}/mist/.headers)
target_link_libraries(urltest mist) target_link_libraries(urltest mist)
add_test(URLTest COMMAND urltest) add_test(URLTest COMMAND urltest)