Merge pull request #974 from Exiv2/0.27.2_Final

Final documentation change for 0.27.2
Exiv2 · Jul 29, 2019 · 70f9405 · 70f9405
2 parents 8f08570 + b53a733
commit 70f9405
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,8 +1,9 @@
 Changes from version 0.27.1 to 0.27.2
 -------------------------------------
 
-Closed: https://github.com/Exiv2/exiv2/milestone/4?closed=1 (61)
+Closed: https://github.com/Exiv2/exiv2/milestone/4?closed=1 (64)
 
+#966 MacOS-X Build issue if Framework/Mono installed (by Visual Studio for Mac)
 #962 Fix integer overflow in WebPImage::getHeaderOffset()
 #959 Fix linking BasicError typeinfo on FreeBSD
 #949 Add Dutch Localisation

diff --git a/releasenotes/Darwin/ReadMe.txt b/releasenotes/Darwin/ReadMe.txt
@@ -5,11 +5,7 @@ Structure of the bundle
 -----------------------
 
 bin/exiv2                                     exiv2 and sample applications
-<<<<<<< HEAD
-lib/libexiv2.0.27.2.3.dylib & libexiv2-xmp.a  libraries
-=======
 lib/libexiv2.0.27.2.dylib & libexiv2-xmp.a    libraries
->>>>>>> Documentation Changes
 lib/pkgconfig/exiv2.pc                        pkg-config file
 lib/cmake/exiv2                               CMake support/consume files
 include/exiv2/                                include files

diff --git a/releasenotes/Unix/ReadMe.txt b/releasenotes/Unix/ReadMe.txt
@@ -5,11 +5,7 @@ Structure of the bundle:
 ------------------------
 
 bin/exiv2                                     exiv2 and sample applications
-<<<<<<< HEAD
-lib/libexiv2.so.0.27.2.3 & libexiv2-xmp.a     libraries
-=======
 lib/libexiv2.so.0.27.2 & libexiv2-xmp.a       libraries
->>>>>>> Documentation Changes
 lib/pkgconfig/exiv2.pc                        pkg-config file
 lib/cmake/exiv2                               CMake support/consume files
 include/exiv2/                                include files

diff --git a/releasenotes/releasenotes.txt b/releasenotes/releasenotes.txt
@@ -1,5 +1,5 @@
 Exiv2 v0.27.2
------------------------------------
+-------------
 
 Exiv2 v0.27 Second Dot Release
 
@@ -20,15 +20,16 @@ Headline Features of Exiv2 v0.27.2
 6) Using mergify to sync select PRs between 0.27-maintenance and 0.28
 7) Preliminary Dutch Localisation
 8) Preliminary Support for Unix (FreeBSD and NetBSD)
+9) Better Build Bundle Dependency handling
 
-Issues fixed since v0.27.1
---------------------------
+Changes since 0.27.1
+--------------------
 
 https://github.com/Exiv2/exiv2/milestone/4?closed=1
 
 Robin Mills
 robin@clanmills.com
-2019-07-22
+2019-07-29
 
 Headline Features of Exiv2 v0.27.1
 ----------------------------------