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/popupcommon.cc
+++ b/rtgui/popupcommon.cc
@@ -22,7 +22,6 @@
 #include <gtkmm.h>
 #include "multilangmgr.h"
 #include "popupcommon.h"
-#include "../rtengine/safegtk.h"
 #include "rtimage.h"
 #include "guiutils.h"