[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=2594c52

The following commit has been merged in the master branch:
commit 2594c52010a6d8b41ed6639db81e1fbabd366dc6
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Sun Mar 11 07:22:41 2012 +0000

    [unstable] Merge branch 'master' (svn trunk r2639) into unstable
    
    Conflicts:
    	CMakeLists.txt
    	README
    	config/configure.ac
    	contrib/buildForMac
    	doc/ChangeLog
    	msvc/exiv2lib/exiv2lib.vcproj
    	msvc64/ReadMe.txt
    	msvc64/exiv2/exiv2.vcproj
    	msvc64/exiv2lib/exiv2lib.vcproj
    	msvc64/include/exv_msvc.h
    	msvc64/runner.py
    	msvc64/runner.txt
    	msvc64/xmpsdk/xmpsdk.vcproj
    	po/de.po
    	po/es.po
    	po/exiv2.pot
    	po/fi.po
    	po/fr.po
    	po/pl.po
    	po/ru.po
    	po/sk.po
    	src/CMakeLists.txt
    	src/actions.cpp
    	src/canonmn.cpp
    	src/easyaccess.cpp
    	src/exiv2.1
    	src/exiv2.cpp
    	src/jpgimage.cpp
    	src/nikonmn.cpp
    	src/preview.cpp
    	src/properties.cpp
    	src/properties.hpp
    	src/samsungmn.cpp
    	src/samsungmn_int.hpp
    	src/tags.cpp
    	src/tags.hpp
    	src/tiffimage.cpp
    	src/xmp.cpp
    	test/data/bugfixes-test.out

-- 
exiv2 packaging