merge with dev

2018-01-14 12:26:00 +01:00
parent 90d4767ad0 b762804b80
commit 90bd7fa98d
28 changed files with 869 additions and 283 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -152,6 +152,7 @@ set(NONCLISOURCEFILES
    localcontrast.cc
    eventmapper.cc
    metadatapanel.cc
+    labgrid.cc
    )

 include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")