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/imageareapanel.cc
+++ b/rtgui/imageareapanel.cc
@@ -18,7 +18,7 @@
 */
 #include "imageareapanel.h"

-ImageAreaPanel::ImageAreaPanel () : before(NULL), after(NULL)
+ImageAreaPanel::ImageAreaPanel () : before(nullptr), after(nullptr)
 {

    imageArea = new ImageArea (this);