[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=3331283

The following commit has been merged in the master branch:
commit 333128352df5ee536e3b8ed874be3b15ccdad3c4
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Apr 29 16:33:59 2015 +0000

    #833.  Thanks to Torsten and Pascal.  Change Minolta 65535 (-1) to "Manual lens" from "E-Mount, T-Mount, Other Lens or No Lens"
---
 src/minoltamn.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/minoltamn.cpp b/src/minoltamn.cpp
index 2a97bf3..d0e568c 100644
--- a/src/minoltamn.cpp
+++ b/src/minoltamn.cpp
@@ -1828,7 +1828,7 @@ namespace Exiv2 {
                  "Sigma 14mm F3.5 | "
                  "Sigma 15mm F2.8 Fisheye" },
         { 25790, "Minolta AF 20mm F2.8" },
-        { 25791, "Minolta/Sony AF 20mm F2.8 | " 
+        { 25791, "Minolta/Sony AF 20mm F2.8 | "
                  "Tokina AT-X 116 PRO DX AF 11-16mm F2.8" },
         { 25810, "Minolta AF 100mm F2.8 Macro" },
         { 25811, "Minolta AF 100mm F2.8 Macro [New] | "
@@ -1919,7 +1919,7 @@ namespace Exiv2 {
         { 45851, "Tamron SP AF 300mm F2.8 LD IF" },
         { 45861, "Tamron SP AF 35-105mm F2.8 LD Aspherical IF" },
         { 45871, "Tamron AF 70-210mm F2.8 SP LD" },
-        { 65535, "E-Mount, T-Mount, Other Lens or No Lens" }
+        { 65535, "Manual lens" }
     };
 
     std::ostream& printMinoltaSonyLensID(std::ostream& os, const Value& value, const ExifData* metadata)

-- 
exiv2 packaging