merge with dev

2017-10-14 08:34:38 +02:00
parent b19e12732a dfe40677e2
commit 74cc88ff2f
109 changed files with 3299 additions and 1084 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -170,6 +170,7 @@ public:
    int dirBrowserHeight;
    int preferencesWidth;
    int preferencesHeight;
+    bool lastShowAllExif;
    int lastScale;
    int panAccelFactor;
    int lastCropSize;