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/coordinateadjuster.h
+++ b/rtgui/coordinateadjuster.h
@@ -47,7 +47,7 @@ class CoordinateProvider
 protected:
    CoordinateAdjuster *coordinateAdjuster;
 public:
-    CoordinateProvider() : coordinateAdjuster(NULL) {}
+    CoordinateProvider() : coordinateAdjuster(nullptr) {}
    virtual ~CoordinateProvider() {}
    void setListener(CoordinateAdjuster *adjuster)
    {