diff options
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index ab6c766f8b2..4558d0f3d5f 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,4 +1,3 @@ -<<<<<<< .mine 2006-01-03 Jerry DeLisle <jvdelisle@gcc.gnu.org> 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 <jvdelisle@gcc.gnu.org> -======= 2006-01-02 Paolo Bonzini <bonzini@gnu.org> ->>>>>>> .r109401 PR target/25259 * configure.ac: Use GCC_HEADER_STDINT. |