[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=6cc5f2e

The following commit has been merged in the master branch:
commit 6cc5f2e69e31421251d1bf5c3cab7672516d2d7f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Tue May 9 19:50:15 2006 +0000

    Minor fix.
---
 src/minoltamn.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/minoltamn.hpp b/src/minoltamn.hpp
index 24d274d..8b2038a 100644
--- a/src/minoltamn.hpp
+++ b/src/minoltamn.hpp
@@ -147,7 +147,7 @@ namespace Exiv2 {
         //! Assemble special Dynax 5D or 7D Minolta entries into an entry with the original tag
         long assemble(Entry& e, IfdId ifdId, uint16_t tag, ByteOrder byteOrder) const;
         //! Assemble special standard Minolta entries into an entry with the original tag
-        long MinoltaMakerNote::assembleStd(Entry& e, IfdId ifdId, uint32_t tag, ByteOrder byteOrder) const;
+        long assembleStd(Entry& e, IfdId ifdId, uint32_t tag, ByteOrder byteOrder) const;
         //! Internal virtual create function.
         MinoltaMakerNote* create_(bool alloc =true) const;
         //! Internal virtual copy constructor.

-- 
exiv2 packaging