[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=796b670

The following commit has been merged in the master branch:
commit 796b670da006e6980a4a2cd8e4aa87ce670bf81e
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Thu Mar 20 03:12:22 2014 +0000

    Issue #953: Add Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD for Canon. Thanks goes to Pekka Sarnila for the patch.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 86fc5e0..e704b56 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -804,6 +804,7 @@ namespace Exiv2 {
         { 213, "Tamron SP 150-600mm F/5-6.3 Di VC USD"                      }, // 1
         { 214, "Canon EF-S 18-55mm f/3.5-5.6 USM"                           },
         { 215, "Canon EF 55-200mm f/4.5-5.6 II USM"                         },
+        { 217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"                  },
         { 224, "Canon EF 70-200mm f/2.8L IS"                                },
         { 225, "Canon EF 70-200mm f/2.8L IS + 1.4x"                         },
         { 226, "Canon EF 70-200mm f/2.8L IS + 2x"                           },

-- 
exiv2 packaging