Fix fomating on Carlos's last changelog entry

[pf3gnuchains/gcc-fork.git] / zlib / ChangeLog.gcj

diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index fc80dba..fedcc88 100644 (file)
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,6 +1,29 @@
-2004-11-25  Kelley Cook  <kcook@gcc.gnu.org>
+2006-06-13  Carlos O'Donell  <carlos@codesourcery.com>
 
-       * configure: Regenerate for libtool reversion.
+       * Makefile.am: Add html and install-html stubs.
+       * Makefile.in: Regenerate.
+       * aclocal.m4: Regenerate.
+
+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>