Merge branch 'dev' into testoutputprofile

2018-07-09 22:12:08 +02:00
parent 6d9c284977 d9cab1f553
commit 180277778a
76 changed files with 1697 additions and 837 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -155,6 +155,7 @@ set(NONCLISOURCEFILES
    eventmapper.cc
    metadatapanel.cc
    labgrid.cc
+    softlight.cc
    )

 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")