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

The following commit has been merged in the master branch:
commit b3aad7a56943a02bdc4ae6794f9d8168d4841959
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue Aug 2 10:09:58 2011 +0000

    #782: Added Tamron 18-270mm lens to Canon makernote. (Jens Mueller)
---
 src/canonmn.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index b7b7204..085ad2b 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -20,14 +20,14 @@
  */
 /*
   File:      canonmn.cpp
-  Version:   $Rev$
+  Version:   $Rev: 2478 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              David Cannings (dc) <david at edeca.net>
              Andi Clemens (ac) <andi.clemens at gmx.net>
  */
 // *****************************************************************************
 #include "rcsid_int.hpp"
-EXIV2_RCSID("@(#) $Id$")
+EXIV2_RCSID("@(#) $Id: canonmn.cpp 2478 2011-06-17 03:08:42Z ahuggel $")
 
 // *****************************************************************************
 // included header files
@@ -479,6 +479,7 @@ namespace Exiv2 {
         {  37, "Tamron 70-200mm f/2.8 Di LD IF Macro"                       }, // 1
         {  37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 2
         {  37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] " }, // 3
+        {  37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro" }, // 4
         {  38, "Canon EF 80-200mm f/4.5-5.6"                                },
         {  39, "Canon EF 75-300mm f/4-5.6"                                  },
         {  40, "Canon EF 28-80mm f/3.5-5.6"                                 },

-- 
exiv2 packaging