Merge branch 'master' into 'gtk3'

2016-03-05 09:21:34 +01:00
parent 830c58877f 72283f867d
commit a04c7706db
119 changed files with 3006 additions and 3007 deletions
--- a/rtgui/lensprofile.cc
+++ b/rtgui/lensprofile.cc
@@ -19,7 +19,6 @@
 #include <glibmm.h>
 #include "lensprofile.h"
 #include "guiutils.h"
-#include "../rtengine/safegtk.h"
 #include "../rtengine/lcp.h"
 #include <sstream>
 #include "rtimage.h"