aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--zlib/ChangeLog.gcj5
1 files changed, 5 insertions, 0 deletions
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 3e253fa..5569030 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2004-10-11 Tom Tromey <tromey@redhat.com>
+
+ PR libgcj/14856:
+ * Imported zlib 1.2.1; merged local changes.
+
2005-06-15 Paolo Bonzini <bonzini@gnu.org>
* Makefile.am: Remove useless multilib rules.