[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=a2cc592

The following commit has been merged in the master branch:
commit a2cc5928a01d16ab3832bd3574feaaef9f535fc1
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun May 26 03:21:15 2013 +0000

    Update Canon lens list to match ExifTool version 9.30.
---
 src/canonmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 76e98e4..77a80e8 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -696,7 +696,8 @@ namespace Exiv2 {
         { 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM"                       },
         { 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM"                        },
         { 4144,"Canon EF 40mm f/2.8 STM"                                    },
-        { 4145,"Canon EF-M 22mm f/2 STM"                                    }
+        { 4145,"Canon EF-M 22mm f/2 STM"                                    },
+        { 4146,"Canon EF-M 18-55mm f/3.5-5.6 IS STM"                        }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.

-- 
exiv2 packaging