merge with dev

2018-11-01 08:37:28 +01:00
parent 21292f6db5 86b282fc68
commit b9c7fa80da
75 changed files with 1248 additions and 378 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -158,6 +158,7 @@ set(NONCLISOURCEFILES
    metadatapanel.cc
    labgrid.cc
    softlight.cc
+    dehaze.cc
    )

 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")