diff options
| author | Tobias Schlüter <tobi@gcc.gnu.org> | 2006-01-06 13:31:17 +0100 |
|---|---|---|
| committer | Tobias Schlüter <tobi@gcc.gnu.org> | 2006-01-06 13:31:17 +0100 |
| commit | cc4bb878f1aeec920683a8d6ec3774e161f386b7 (patch) | |
| tree | e339d5a10fe42ffbb5a9d756b5e7be7ad006ad08 /libgfortran | |
| parent | f37a6f4f57b43f50c1b5920169e0d696fc2a7985 (diff) | |
| download | gcc-cc4bb878f1aeec920683a8d6ec3774e161f386b7.zip gcc-cc4bb878f1aeec920683a8d6ec3774e161f386b7.tar.gz gcc-cc4bb878f1aeec920683a8d6ec3774e161f386b7.tar.bz2 | |
Fix previous ChangeLog entry
From-SVN: r109417
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 ab6c766..4558d0f 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. |