Merge branch 'dev' into newlocallab

2019-03-12 14:57:17 +01:00
parent 4756e5184c 86690f1ca0
commit 020204e0cb
150 changed files with 1822 additions and 1298 deletions
--- a/rtgui/profilepanel.cc
+++ b/rtgui/profilepanel.cc
@@ -17,12 +17,15 @@
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "profilepanel.h"
-#include "options.h"
+
 #include "clipboard.h"
 #include "multilangmgr.h"
+#include "options.h"
 #include "profilestorecombobox.h"
 #include "rtimage.h"

+#include "../rtengine/procparams.h"
+
 using namespace rtengine;
 using namespace rtengine::procparams;