merge with dev

2017-12-21 08:42:43 +01:00
parent a017505cec 62585bc434
commit 46181f1008
43 changed files with 878 additions and 75 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -149,6 +149,8 @@ set(NONCLISOURCEFILES
    xtransrawexposure.cc
    zoompanel.cc
    fattaltonemap.cc
+    localcontrast.cc
+    eventmapper.cc
    )

 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")