[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=43967b6

The following commit has been merged in the master branch:
commit 43967b66035968af465fb4a8b3d68f63e72a5180
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sun Jul 14 02:11:34 2013 +0000

    Update Canon camera model list to match ExifTool version 9.33.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 9bf5010..21f73d7 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -311,6 +311,7 @@ namespace Exiv2 {
         { 0x80000301, N_("EOS Rebel T4i / 650D / Kiss X6i") },
         { 0x80000302, N_("EOS 6D") },
         { 0x80000324, N_("EOS-1D C") },
+        { 0x80000325, N_("EOS 70D") },
         { 0x80000326, N_("EOS Rebel T5i / 700D / Kiss X7i") },
         { 0x80000331, N_("EOS M") },
         { 0x80000346, N_("EOS Rebel SL1 / 100D / Kiss X7") },

-- 
exiv2 packaging