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/renamedlg.cc
+++ b/rtgui/renamedlg.cc
@@ -22,7 +22,7 @@
 #include "rtimage.h"

 RenameDialog::RenameDialog (Gtk::Window* parent)
-    : Gtk::Dialog (M("FILEBROWSER_RENAMEDLGLABEL"), *parent, true), p(parent), imageData(NULL)
+    : Gtk::Dialog (M("FILEBROWSER_RENAMEDLGLABEL"), *parent, true), p(parent), imageData(nullptr)
 {

    Gtk::Table* names = Gtk::manage (new Gtk::Table (2, 2));