[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=3d4ab31

The following commit has been merged in the master branch:
commit 3d4ab310878b6146127d52e82a68f9639a2a123c
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 17 18:21:48 2008 +0000

    Updated ChangeLog again, added Olympus2 makernote format doc.
---
 doc/ChangeLog                | 10 +++++-----
 doc/templates/__makernotes__ | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3498af5..a794501 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,10 +1,6 @@
 Changes from version 0.18-pre2 to 0.18
 --------------------------------------
 
-* MSVC related
-	         - [build environment] More fixes for the MSVC build environment.
-	           (Robin Mills)
-
 * Exiv2 utility
 	- 0000580: [tools] -M option fails and reports success.
 	           (Reported by Daniel Blueman)
@@ -45,7 +41,11 @@ Changes from version 0.18-pre2 to 0.18
 	         - [translation] Updated German translation.
 	           (Oliver Dörr)
 	         - [translation] Updated Slovak translations.
-	           (Ivan Masár)
+	           (Ivan Masar)
+
+* MSVC related
+	- 0000578: [build environment] More fixes for the MSVC build environment.
+	           (Robin Mills)
 
 
 Changes from version 0.18-pre1 to 0.18-pre2
diff --git a/doc/templates/__makernotes__ b/doc/templates/__makernotes__
index 41e75db..ce4c4c6 100644
--- a/doc/templates/__makernotes__
+++ b/doc/templates/__makernotes__
@@ -97,6 +97,15 @@
     <td> </td>
    </tr>
    <tr class="OddRow"> 
+    <td>OLYMPUS</td>
+    <td>IFD, at offset 12</td>
+    <td>"OLYMPUS

-- 
exiv2 packaging