Import zlib 1.2.8 with local change merged in.

[deliverable/binutils-gdb.git] / zlib / ChangeLog.gcj

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 736be14b4a02696b14eb24ed463a2d68fb8b578c..252f2299fda7e881053152db5da8410684a1f3bc 100644 (file)
--- 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>