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

The following commit has been merged in the master branch:
commit f373a06dfb9a9c972e4df41346bfe10e78075123
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Nov 27 17:21:04 2014 +0000

    Issue: #1005.  Thanks Pascal for the patch.
---
 src/canonmn.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 1778376..41bdc80 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -880,7 +880,8 @@ namespace Exiv2 {
         { 4147,"Canon EF-M 11-22mm f/4-5.6 IS STM"                          },
         { 4148,"Canon EF-S 55-250mm f/4-5.6 IS STM"                         },
         { 4149,"Canon EF-M 55-200mm f/4.5-6.3 IS STM"                       },
-        { 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM"                        }
+        { 4150,"Canon EF-S 10-18mm f/4.5-5.6 IS STM"                        },
+        { 4154,"Canon EF-S 24mm f/2.8 STM"                                  }
     };
 
     //! A lens id and a pretty-print function for special treatment of the id.

-- 
exiv2 packaging