summaryrefslogtreecommitdiff
path: root/libgfortran
diff options
context:
space:
mode:
authortobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2006-01-06 12:31:17 +0000
committertobi <tobi@138bc75d-0d04-0410-961f-82ee72b054a4>2006-01-06 12:31:17 +0000
commit73100110dc9d773924ca6217f4f19c89d6373e2d (patch)
treee339d5a10fe42ffbb5a9d756b5e7be7ad006ad08 /libgfortran
parent538cbb1ecf7a2cbb821f14b49a32ebfe7bb271da (diff)
downloadgcc-73100110dc9d773924ca6217f4f19c89d6373e2d.tar.gz
Fix previous ChangeLog entry
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@109417 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran')
-rw-r--r--libgfortran/ChangeLog4
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.