X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=zlib%2FChangeLog.gcj;h=d56c4d5204d36ef4c1441150f4df87e15a145000;hb=c310cb0f3c1ffdf1c9f218cb7d306248f633289c;hp=36a9a169b193c17cbf213da8a8c20926d648a3ee;hpb=7f93fe7a469fb4d342d90736e801fcafb23b5a8b;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 36a9a169b19..d56c4d5204d 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,24 @@
+2005-06-14  Tom Tromey  <tromey@redhat.com>
+
+	* Imported zlib 1.2.3; merged local changes.
+
+2005-06-14  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/19877:
+	* configure, aclocal.m4, Makefile.in: Rebuilt.
+
+2005-06-06  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+	* zconf.h (NO_vsnprintf): Define on Tru64 UNIX V4.0.
+
+2005-05-09  Mike Stump  <mrs@apple.com>
+	
+	* configure: Regenerate.
+
+2005-04-12  Mike Stump  <mrs@apple.com>
+
+	* configure: Regenerate.
+
 2004-11-24  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* configure: Regenerate for libtool change.