From da09a436519e8085d328a586c438b5b0a560924d Mon Sep 17 00:00:00 2001
From: Joel Brobecker <brobecker@adacore.com>
Date: Wed, 25 Nov 2015 15:09:09 -0800
Subject: Import zlib 1.2.8 with local change merged in.

ChangeLog:

        * zlib: Update to zlib 1.2.8 with local changes merged in.
---
 zlib/ChangeLog.gcj | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'zlib/ChangeLog.gcj')

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 736be14..252f229 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,8 +1,12 @@
-2015-03-31  H.J. Lu  <hongjiu.lu@intel.com>
+2015-11-23  Matthias Klose  <doko@ubuntu.com>
 
-	* configure.ac (AM_ENABLE_MULTILIB): Use only if
-	${with_target_subdir} isn't empty.
-	* configure: Regenerated.
+	* Imported zlib 1.2.8; merged local changes.
+
+2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
+
+	* Makefile.in: Regenerated with automake-1.11.6.
+	* aclocal.m4: Likewise.
+	* configure: Likewise.
 
 2014-11-11  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
-- 
cgit v1.1