From 1325e2b519f4a1b3d9fbd92ece22bdf3e4df0b06 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@gcc.gnu.org>
Date: Mon, 11 Oct 2004 18:45:11 +0000
Subject: [PATCH] ChangeLog file for zlib

Changes in 1.2.1 (17 November 2003)

From-SVN: r88897
---
 zlib/ChangeLog.gcj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 3e253faf329..5569030bb7d 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.