Merge branch 'master' into gtk3

2016-10-16 23:26:51 +02:00
parent a6fc7cd37d 50165dab20
commit 4efae5c764
53 changed files with 4404 additions and 857 deletions
--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@@ -26,6 +26,7 @@
 #include "../rtengine/improccoordinator.h"
 #include "../rtengine/color.h"
 #include "../rtengine/opthelper.h"
+#include "../rtengine/iccstore.h"
 using namespace rtengine;

 extern Options options;