[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=7468ed6

The following commit has been merged in the master branch:
commit 7468ed6c21a968df7219c81450100e581e130d40
Author: Robin Mills <robin at clanmills.com>
Date:   Wed Nov 19 19:41:50 2014 +0000

    Issue: #1000  Cosmetic code sorting issue.
---
 src/samsungmn.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/samsungmn.cpp b/src/samsungmn.cpp
index afc5be4..6926259 100644
--- a/src/samsungmn.cpp
+++ b/src/samsungmn.cpp
@@ -55,8 +55,8 @@ namespace Exiv2 {
         {  2, N_("Samsung NX 18-55mm F3.5-5.6 OIS")               },
         {  3, N_("Samsung NX 50-200mm F4-5.6 ED OIS")             },
         {  4, N_("Samsung NX 20-50mm F3.5-5.6 ED")                },
-        {  6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS")           },
         {  5, N_("Samsung NX 20mm F2.8 Pancake")                  },
+        {  6, N_("Samsung NX 18-200mm F3.5-6.3 ED OIS")           },
         {  7, N_("Samsung NX 60mm F2.8 Macro ED OIS SSA")         },
         {  8, N_("Samsung NX 16mm F2.4 Pancake")                  },
         {  9, N_("Samsung NX 85mm F1.4 ED SSA")                   },

-- 
exiv2 packaging