Merge branch 'dev' into libraw-copylib

2024-03-02 21:01:34 -08:00
parent 6daf3f6a23 f687bda276
commit 51e52d9aba
110 changed files with 5275 additions and 4040 deletions
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -251,6 +251,8 @@ class Preferences final :

    Gtk::CheckButton *enableLibRaw;

+    Gtk::ComboBoxText *maxZoomCombo;
+
    Gtk::ComboBoxText *metadataSyncCombo;
    Gtk::ComboBoxText *xmpSidecarCombo;