[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=9ac7435

The following commit has been merged in the master branch:
commit 9ac743555855da789072d8e8abb295c914d02576
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Jun 16 03:28:53 2013 +0000

    Pentax Optio M30 was listed twice in the Pentax camera model list.
---
 src/pentaxmn.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 5fff345..278d9d9 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -112,7 +112,6 @@ namespace Exiv2 {
         {    0x12c32, N_("Optio M20") },
         {    0x12c3c, N_("Optio W20") },
         {    0x12c46, N_("Optio A20") },
-        {    0x12c8c, N_("Optio M30") },
         {    0x12c78, N_("Optio E30") },
         {    0x12c7d, N_("Optio E35") },
         {    0x12c82, N_("Optio T30") },

-- 
exiv2 packaging