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

The following commit has been merged in the master branch:
commit e5c7c207deffe0690f2f4613c4e0c0c62a668456
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Mar 11 03:57:55 2012 +0000

    #815: Checked-in patch with new Tokina lens by Chris Chiappa.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index c84c592..7e662a6 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -561,6 +561,7 @@ namespace Exiv2 {
         { 160, "Tamron AF 19-35mm f/3.5-4.5"                                }, // 1
         { 160, "Tokina AT-X 124 AF 12-24mm f/4 DX"                          }, // 2
         { 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5"           }, // 3
+        { 160, "Tokina AT-X 116 PRO DX AF 11-16mm f/2.8"                    }, // 4
         { 161, "Canon EF 28-70mm f/2.8L"                                    }, // 0
         { 161, "Sigma 24-70mm EX f/2.8"                                     }, // 1
         { 161, "Sigma 28-70mm f/2.8 EX"                                     }, // 2

-- 
exiv2 packaging