Merge branch 'dev' into pixelshift_fixes

2018-04-14 23:25:59 +02:00
parent 3578529082 38d8fbfcc8
commit 651ad4d0f0
27 changed files with 1 additions and 1 deletions
--- a/rtdata/dcpprofiles/FUJIFILM
+++ b/rtdata/dcpprofiles/FUJIFILM
--- a/rtdata/dcpprofiles/NIKON
+++ b/rtdata/dcpprofiles/NIKON
--- a/rtdata/dcpprofiles/NIKON
+++ b/rtdata/dcpprofiles/NIKON
--- a/rtdata/dcpprofiles/NIKON
+++ b/rtdata/dcpprofiles/NIKON
--- a/rtdata/dcpprofiles/NIKON
+++ b/rtdata/dcpprofiles/NIKON
--- a/rtdata/dcpprofiles/OLYMPUS
+++ b/rtdata/dcpprofiles/OLYMPUS
--- a/rtdata/dcpprofiles/OLYMPUS
+++ b/rtdata/dcpprofiles/OLYMPUS
--- a/rtdata/dcpprofiles/OLYMPUS
+++ b/rtdata/dcpprofiles/OLYMPUS
--- a/rtdata/dcpprofiles/Olympus
+++ b/rtdata/dcpprofiles/Olympus
--- a/rtdata/dcpprofiles/PENTAX
+++ b/rtdata/dcpprofiles/PENTAX
--- a/rtdata/dcpprofiles/PENTAX
+++ b/rtdata/dcpprofiles/PENTAX
--- a/rtdata/dcpprofiles/PENTAX
+++ b/rtdata/dcpprofiles/PENTAX
--- a/rtdata/dcpprofiles/Panasonic
+++ b/rtdata/dcpprofiles/Panasonic
--- a/rtdata/dcpprofiles/Panasonic
+++ b/rtdata/dcpprofiles/Panasonic
--- a/rtdata/dcpprofiles/Panasonic
+++ b/rtdata/dcpprofiles/Panasonic
--- a/rtdata/dcpprofiles/Panasonic
+++ b/rtdata/dcpprofiles/Panasonic
--- a/rtdata/dcpprofiles/Panasonic
+++ b/rtdata/dcpprofiles/Panasonic
--- a/rtdata/dcpprofiles/RICOH
+++ b/rtdata/dcpprofiles/RICOH
--- a/rtdata/dcpprofiles/RICOH
+++ b/rtdata/dcpprofiles/RICOH
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/SONY
+++ b/rtdata/dcpprofiles/SONY
--- a/rtdata/dcpprofiles/YI
+++ b/rtdata/dcpprofiles/YI
--- a/rtdata/dcpprofiles/camera_model_aliases.json
+++ b/rtdata/dcpprofiles/camera_model_aliases.json
@@ -21,7 +21,7 @@
    "MINOLTA DYNAX 7D": ["Minolta Maxxum 7D", "Minolta Alpha 7D"],

    "Panasonic DC-FZ82": ["Panasonic DMC-FZ80", "Panasonic DMC-FZ85"],
-    "Panasonic DC-TZ90": ["Panasonic DC-ZS70", "Panasonic DC-FZ91", "Panasonic DC-FZ92", "Panasonic DC-FZ93"],
+    "Panasonic DC-TZ91": ["Panasonic DC-TZ90", "Panasonic DC-TZ92", "Panasonic DC-TZ93", "Panasonic DC-ZS70"],
    "Panasonic DMC-G8": ["Panasonic DMC-G80", "Panasonic DMC-G81", "Panasonic DMC-G85"],
    "Panasonic DMC-LX15": ["Panasonic DMC-LX9", "Panasonic DMC-LX10"],
    "Panasonic DC-TZ100": ["Panasonic DC-ZS100", "Panasonic DC-ZS110", "Panasonic DC-TZ101", "Panasonic DC-TZ110"],