merge with dev...

2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
--- a/rtgui/partialpastedlg.h
+++ b/rtgui/partialpastedlg.h
@@ -102,8 +102,6 @@ public:
    Gtk::CheckButton* raw_black;
    Gtk::CheckButton* raw_ca_autocorrect;
    Gtk::CheckButton* raw_caredblue;
-    Gtk::CheckButton* raw_cablue;
-    Gtk::CheckButton* raw_caautostrength;
    Gtk::CheckButton* raw_hotpix_filt;
    Gtk::CheckButton* raw_deadpix_filt;
    Gtk::CheckButton* raw_linenoise;