Merge branch 'master' into clang-tidy

2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
--- a/rtgui/histogrampanel.cc
+++ b/rtgui/histogrampanel.cc
@@ -26,9 +26,9 @@
 #include "../rtengine/improccoordinator.h"
 #include "../rtengine/color.h"
 #include "../rtengine/opthelper.h"
+#include "../rtengine/iccstore.h"
 using namespace rtengine;

-extern Glib::ustring argv0;
 extern Options options;