Merge branch 'dev' into newlocallab

2018-09-15 20:53:21 +02:00
parent 47f0564d25 e99bcff8bb
commit e9d4dede48
178 changed files with 4228 additions and 3683 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -165,7 +165,7 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::CheckButton* filmStripOverlayedFileNames;
    Gtk::CheckButton* sameThumbSize;

-    Gtk::SpinButton*  rgbDenoiseTreadLimitSB;
+    Gtk::SpinButton*  threadsSpinBtn;
    Gtk::SpinButton*  clutCacheSizeSB;
    Gtk::SpinButton*  maxInspectorBuffersSB;
    Gtk::ComboBoxText *thumbnailInspectorMode;