link_hash_copy_indirect and symbol flags

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

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 4fa5446c188da3479ca7067ecd34053c1a7e4aee..252f2299fda7e881053152db5da8410684a1f3bc 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,13 @@
+2015-11-23  Matthias Klose  <doko@ubuntu.com>
+
+       * 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>
 
        PR target/63610