Merge branch 'master' of https://github.com/stativ/vogl into stativ-master

Conflicts:
	src/vogleditor/CMakeLists.txt

diff --cc src/vogleditor/CMakeLists.txt
index bf2c3c66e3c0f2539db3c1cba96bc7c266d345d5,e63fd93b886bcd2162023d60781572dd76b92fe2..cfccb7ee60c78787875d7d3f520bcc4f8695b8e4
--- 1/src/vogleditor/CMakeLists.txt
--- 2/src/vogleditor/CMakeLists.txt
+++ b/src/vogleditor/CMakeLists.txt
@@@ -150,11 -151,12 +151,13 @@@ target_link_libraries(${PROJECT_NAME
        ${QT_QTCORE_LIBRARY} 
        ${QT_QTGUI_LIBRARY} 
        ${TELEMETRY_LIBRARY}
+       ${CMAKE_THREAD_LIBS_INIT}
+       ${X11_X11_LIB}
        backtrace
        voglcommon
 -      voglcore
 -      dl
 +    voglcore
 +    X11
 +    dl
     )
  
  build_options_finalize()