Merge master into gtk3

2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
--- a/rtgui/rotate.cc
+++ b/rtgui/rotate.cc
@@ -27,7 +27,7 @@ using namespace rtengine::procparams;
 Rotate::Rotate () : FoldableToolPanel(this, "rotate", M("TP_ROTATE_LABEL"))
 {

-    rlistener = NULL;
+    rlistener = nullptr;

    //TODO the action of the rotation slider is counter-intuitive
    Gtk::Image* irotateL =   Gtk::manage (new RTImage ("rotate-right-2.png"));