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/histogrampanel.h
+++ b/rtgui/histogrampanel.h
@@ -128,7 +128,7 @@ protected:

 public:

-    explicit HistogramArea(FullModeListener *fml = NULL);
+    explicit HistogramArea(FullModeListener *fml = nullptr);
    ~HistogramArea();

    void updateBackBuffer ();