merge with dev...

2017-06-19 12:30:20 +02:00
parent f1a90dad54 a9f769c5d7
commit acd715dd44
90 changed files with 598 additions and 866 deletions
--- a/rtgui/main.cc
+++ b/rtgui/main.cc
@@ -420,7 +420,6 @@ void deleteProcParams (std::vector<rtengine::procparams::PartialProfile*> &ppara

 int processLineParams ( int argc, char **argv )
 {
-    unsigned errors = 0;

    for( int iArg = 1; iArg < argc; iArg++) {
        Glib::ustring currParam(argv[iArg]);
@@ -477,5 +476,5 @@ int processLineParams ( int argc, char **argv )
        return 1;
    }

-    return errors > 0 ? -2 : 0;
+    return 0;
 }