summaryrefslogtreecommitdiff
path: root/libgfortran/ChangeLog
diff options
context:
space:
mode:
authorjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-04 15:59:54 +0000
committerjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2007-10-04 15:59:54 +0000
commitb6d39bcbb126b49d4795495f147f5307d31f0542 (patch)
tree88a346449946903312935955db803d3c0a267307 /libgfortran/ChangeLog
parenta6d91770b85016a68653f0d1655868e39319b065 (diff)
downloadgcc-b6d39bcbb126b49d4795495f147f5307d31f0542.tar.gz
Fix ChangeLog.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@129017 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgfortran/ChangeLog')
-rw-r--r--libgfortran/ChangeLog3
1 files changed, 0 insertions, 3 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 8e4140eb065..ad4c411c2a7 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