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/coloredbar.cc
+++ b/rtgui/coloredbar.cc
@@ -290,5 +290,5 @@ void ColoredBar::clearBgGradient ()

 bool ColoredBar::canGetColors()
 {
-    return colorProvider != NULL || bgGradient.size() > 0;
+    return colorProvider != nullptr || bgGradient.size() > 0;
 }