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

The following commit has been merged in the master branch:
commit c833b87f484bb16f4987d69891a66880e489f6b5
Author: nkbj <nkbj1970 at hotmail.com>
Date:   Sat Oct 4 05:58:43 2014 +0000

    Add new camera model ID: Canon PowerShot SX60 HS.
---
 src/canonmn.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 517ec22..1cfabd1 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -264,6 +264,7 @@ namespace Exiv2 {
         { (long int)0x3690000, N_("PowerShot ELPH 135 / IXUS 145 / IXY 120") },
         { (long int)0x3700000, N_("PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630") },
         { (long int)0x3710000, N_("PowerShot ELPH 150 IS / IXUS 155 / IXY 140") },
+        { (long int)0x3750000, N_("PowerShot SX60 HS") },
         { (long int)0x3760000, N_("PowerShot SX520 HS") },
         { (long int)0x3780000, N_("PowerShot G7 X") },
         { (long int)0x4040000, N_("PowerShot G1") },

-- 
exiv2 packaging