Merge branch 'HEAD' of https://github.com/tvdzwan/hyperion.git into multi_colortransform

Former-commit-id: fb4ab6331b5428bd34f5cc7ac7eba3fade5ef7dc
This commit is contained in:
T. van der Zwan
2013-11-20 08:26:09 +00:00
14 changed files with 51 additions and 14 deletions

View File

@@ -82,4 +82,5 @@ target_link_libraries(hyperion
hyperion-utils
serialport
${QT_LIBRARIES}
${LIBUSB_1_LIBRARIES})
${LIBUSB_1_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT})