From: Tobias Schlüter Date: Fri, 6 Jan 2006 12:31:17 +0000 (+0100) Subject: Fix previous ChangeLog entry X-Git-Tag: releases/gcc-4.2.0~5002 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc4bb878f1aeec920683a8d6ec3774e161f386b7;p=thirdparty%2Fgcc.git Fix previous ChangeLog entry From-SVN: r109417 --- diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index ab6c766f8b27..4558d0f3d5fc 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< .mine 2006-01-03 Jerry DeLisle PR libgfortran/25598 @@ -8,10 +7,7 @@ * io/transfer.c (next_record_r): Fix line lengths, no functional change. a null value (default). Revert patch of 25419 on 2005-12-28. -2005-12-31 Jerry DeLisle -======= 2006-01-02 Paolo Bonzini ->>>>>>> .r109401 PR target/25259 * configure.ac: Use GCC_HEADER_STDINT.