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/preferences.h
+++ b/rtgui/preferences.h
@@ -191,7 +191,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::Entry* txtSndLngEditProcDone;
    Gtk::SpinButton* spbSndLngEditProcDoneSecs;

-    Gtk::CheckButton* ckbTunnelMetaData;
    Gtk::CheckButton* ckbInternalThumbIfUntouched;

    Gtk::Entry* txtCustProfBuilderPath;