Merge from branch 'dev/newlocallab'...

2018-10-08 20:56:29 +02:00
parent 854021cfee 23bcf63e2c
commit 88c5214a47
156 changed files with 1988 additions and 2057 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -198,7 +198,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::CheckButton* ckbFileBrowserToolbarSingleRow;
    Gtk::CheckButton* ckbShowFilmStripToolBar;
    Gtk::CheckButton* ckbHideTPVScrollbar;
-    Gtk::CheckButton* ckbUseIconNoText;

    Gtk::CheckButton* ckbAutoSaveTpOpen;
    Gtk::Button* btnSaveTpOpenNow;