aboutsummaryrefslogtreecommitdiff
path: root/zlib/ChangeLog.gcj
diff options
context:
space:
mode:
Diffstat (limited to 'zlib/ChangeLog.gcj')
-rw-r--r--zlib/ChangeLog.gcj12
1 files changed, 8 insertions, 4 deletions
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>