solved merge conflicts for merge from dev into newlocallab

2017-11-15 16:49:53 +01:00
parent 0ac7744347 3f1e47d3d5
commit 0df571b2db
63 changed files with 1212 additions and 1927 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -258,7 +258,7 @@ RTWindow *create_rt_window()
    Glib::RefPtr<Gtk::IconTheme> defaultIconTheme = Gtk::IconTheme::get_default();
    defaultIconTheme->append_search_path (icon_path);

-    rtengine::setPaths (options);
+    rtengine::setPaths();
    MyExpander::init();  // has to stay AFTER rtengine::setPaths

    // ------- loading theme files