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

The following commit has been merged in the master branch:
commit b24ed3c742358589ee841c5b0722ec62f5a1e3fb
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Thu Sep 8 14:32:13 2011 +0000

    Tweaks.
---
 doc/ChangeLog | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index ba801e4..2d90fc8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -29,8 +29,8 @@ Changes from version 0.21.1 to 0.22
 	           segment. (Reported by Stefan Brandl)
 	- 0000757: Wrong ELSE statement in src/CMakeLists.txt.
 	           (Reported by Michael Hansen)
-	- 0000708: On Windows (MSVC and MSYS/MinGw builds), charset conversions
-	           now use respective Windows functions if iconv is not available.
+	- 0000708: On Windows (MSVC and MinGW builds), charset conversions now
+	           use respective Windows functions if iconv is not available.
 	- 0000689: Support for Encapsulated PostScript (*.eps) files.
 	           (Michael Ulbrich, Volker Grabsch)
 	- 0000439: The exiv2 library should be re-entrant.
@@ -356,7 +356,7 @@ Changes from version 0.18 to 0.18.1
 	           (Reported with patch by Lukasz Krzyzak)
 	- 0000618: Easy access to information which may be in different Exif tags.
 	           (Based on a patch from Carsten Pfeiffer)
-	- 0000615: Setting the Exif makernote tag aborts if type is not 
+	- 0000615: Setting the Exif makernote tag aborts if type is not
 	           "undefined". (digiKam bug 182738)
 	- 0000609: Building a DLL of Exiv2 0.18 in MinGW requires -no-undefined
 	           linker flag. (Reported with solution by Giuseppe Rota)

-- 
exiv2 packaging