merge with dev - I hope no error

2018-01-02 19:58:42 +01:00
parent f1e8aeefcb e229b9519e
commit 63073b470d
66 changed files with 2796 additions and 2393 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -151,6 +151,7 @@ set(NONCLISOURCEFILES
    fattaltonemap.cc
    localcontrast.cc
    eventmapper.cc
+    metadatapanel.cc
    )

 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")