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/filterpanel.cc
+++ b/rtgui/filterpanel.cc
@@ -23,7 +23,7 @@

 using namespace rtengine;

-FilterPanel::FilterPanel () : listener (NULL)
+FilterPanel::FilterPanel () : listener (nullptr)
 {

    enabled = Gtk::manage (new Gtk::CheckButton (M("EXIFFILTER_METADATAFILTER")));