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/popupcommon.cc
+++ b/rtgui/popupcommon.cc
@@ -27,8 +27,8 @@

 PopUpCommon::PopUpCommon (Gtk::Button* thisButton, const Glib::ustring& label)
    : selected (-1) // -1 means that the button is invalid
-    , menu (0)
-    , buttonImage (0)
+    , menu (nullptr)
+    , buttonImage (nullptr)
 {
    button = thisButton;
    hasMenu = false;