Merge branch 'master' into gtk3-merge-master-b8eb349

2016-10-10 23:07:41 +02:00
parent d16d244fc5 b8eb3492c9
commit 0dbea030cb
166 changed files with 15898 additions and 2285 deletions
--- a/rtgui/inspector.h
+++ b/rtgui/inspector.h
@@ -34,7 +34,7 @@ public:
    int currTransform;  // coarse rotation from RT, not from shot orientation
    bool fromRaw;

-    InspectorBuffer(const Glib::ustring &imgagePath);
+    explicit InspectorBuffer(const Glib::ustring &imgagePath);
    //~InspectorBuffer();
 };