synced with master (merged master into retinex)

2015-10-17 12:27:26 +02:00
parent 678177bad9 a9ba2d7a09
commit 349c6d33a6
20 changed files with 874 additions and 649 deletions
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -16,7 +16,7 @@
 *  You should have received a copy of the GNU General Public License
 *  along with RawTherapee.  If not, see <http://www.gnu.org/licenses/>.
 */
-#include <sigc++/class_slot.h>
+#include <sigc++/slot.h>
 #include "preferences.h"
 #include "multilangmgr.h"
 #include "splash.h"