merge with dev

2018-10-07 09:58:43 +02:00
parent e9d4dede48 c34bd31765
commit 72ed6f81b0
156 changed files with 1988 additions and 2059 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -201,7 +201,6 @@ class Preferences : public Gtk::Dialog, public ProfileStoreListener
    Gtk::CheckButton* ckbShowFilmStripToolBar;
    Gtk::CheckButton* ckbShowdelimspot;
    Gtk::CheckButton* ckbHideTPVScrollbar;
-    Gtk::CheckButton* ckbUseIconNoText;

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