merge with dev

2018-07-07 13:46:18 +02:00
parent c1463c7edd 523fe40662
commit e65c6786ff
92 changed files with 2399 additions and 1322 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}")