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/history.cc
+++ b/rtgui/history.cc
@@ -17,10 +17,13 @@
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "history.h"
+
+#include "eventmapper.h"
+#include "guiutils.h"
 #include "multilangmgr.h"
 #include "rtimage.h"
-#include "guiutils.h"
-#include "eventmapper.h"
+
+#include "../rtengine/procparams.h"

 using namespace rtengine;
 using namespace rtengine::procparams;