synced with master (merged master into gtk3)

2015-10-17 16:23:10 +02:00
parent d8e4709458 26b5d4f25e
commit 35775f3b3f
98 changed files with 6601 additions and 1473 deletions
--- a/rtgui/thresholdadjuster.cc
+++ b/rtgui/thresholdadjuster.cc
@@ -17,14 +17,7 @@
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "thresholdadjuster.h"
-
-// class_slot is no longer part of the sigc++ source tree, but starting from which version ?
-#if 1
 #include <sigc++/slot.h>
-#else
-#include <sigc++/class_slot.h>
-#endif
-
 #include <cmath>
 #include "multilangmgr.h"
 #include "../rtengine/rtengine.h"