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

The following commit has been merged in the master branch:
commit ca142e17b3f99a73d5d021f38dcc157d703c8b49
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sat Sep 3 15:02:19 2011 +0000

    Added Exif.OlympusEq.LensModel to the Exiv2::lensName() easy-access function. (Niels Kristian Bech Jensen)
---
 doc/ChangeLog      | 2 ++
 src/easyaccess.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index fb55fa5..ff66e1d 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -39,6 +39,8 @@ Changes from version 0.21.1 to 0.22
 	           (Milan Knizek)
 	         - Added Exif.Panasonic.LensType to the Exiv2::lensName()
 	           easy-access function. (Adrian Woodley)
+	         - Added Exif.OlympusEq.LensModel to the Exiv2::lensName()
+	           easy-access function. (Niels Kristian Bech Jensen)
 	         - Added new function Exiv2::versionNumberHexString().
 	           (Volker Grabsch)
 	         - Updated Nikon Lens lookup table to v4.3.423.01 of
diff --git a/src/easyaccess.cpp b/src/easyaccess.cpp
index 09b5c8f..7e34ce9 100644
--- a/src/easyaccess.cpp
+++ b/src/easyaccess.cpp
@@ -263,6 +263,7 @@ namespace Exiv2 {
             "Exif.SonyMinolta.LensID",
             "Exif.Sony1.LensID",
             "Exif.Sony2.LensID",
+            "Exif.OlympusEq.LensModel",
             "Exif.Panasonic.LensType",
             "Exif.Samsung2.LensType"
         };

-- 
exiv2 packaging