Merge branch 'dev' into hidpi-icons

2019-03-13 01:00:14 +01:00
parent 4c904967b2 86690f1ca0
commit 52dcd08b97
165 changed files with 2388 additions and 1653 deletions
--- a/rtgui/filmsimulation.cc
+++ b/rtgui/filmsimulation.cc
@@ -1,12 +1,13 @@
+#include <chrono>
 #include <map>
 #include <set>

 #include "filmsimulation.h"

-#include <chrono>
-
 #include "options.h"
+
 #include "../rtengine/clutstore.h"
+#include "../rtengine/procparams.h"

 using namespace rtengine;
 using namespace rtengine::procparams;