merge with dev

2018-08-05 09:05:47 +02:00
parent a4c92ac986 263d96eeca
commit 5472673b9e
146 changed files with 6196 additions and 2570 deletions
--- a/rtgui/CMakeLists.txt
+++ b/rtgui/CMakeLists.txt
@@ -71,6 +71,7 @@ set(NONCLISOURCEFILES
    histogrampanel.cc
    history.cc
    hsvequalizer.cc
+    iccprofilecreator.cc
    icmpanel.cc
    ilabel.cc
    imagearea.cc