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/options.h
+++ b/rtgui/options.h
@@ -251,7 +251,6 @@ public:
    double sndLngEditProcDoneSecs;  // Minimum processing time seconds till the sound is played
    bool sndEnable;

-    bool tunnelMetaData;    // Pass through IPTC and XMP unchanged
    int histogramPosition;  // 0=disabled, 1=left pane, 2=right pane
    //int histogramWorking;  // 0=disabled, 1=left pane, 2=right pane
    bool histogramBar;