aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJerry DeLisle <jvdelisle@gcc.gnu.org>2007-10-04 15:59:54 +0000
committerJerry DeLisle <jvdelisle@gcc.gnu.org>2007-10-04 15:59:54 +0000
commitfed2a4733b7b0aea5a23923509518acbe72e709b (patch)
tree88a346449946903312935955db803d3c0a267307
parent808a2225f9e47b6c4c26cefc2c7068133a42ff66 (diff)
downloadgcc-fed2a4733b7b0aea5a23923509518acbe72e709b.zip
gcc-fed2a4733b7b0aea5a23923509518acbe72e709b.tar.gz
gcc-fed2a4733b7b0aea5a23923509518acbe72e709b.tar.bz2
Fix ChangeLog.
From-SVN: r129017
-rw-r--r--libgfortran/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8e4140e..ad4c411 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,11 +1,9 @@
-<<<<<<< .mine
2007-10-04 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/33253
* io/list_read.c (read_character): Use line_buffer to scan ahead for
object name or string when no delimiter is found.
-=======
2007-10-04 Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
PR libfortran/32021
@@ -18,7 +16,6 @@
fpu_precision, sighup, sigint, allocate_init_flag and
allocate_init_value.
->>>>>>> .r129015
2007-10-02 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libfortran/33253