summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-26 03:26:51 +0000
committerjvdelisle <jvdelisle@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-26 03:26:51 +0000
commit44c4af00bee3e89f65e006f0d191aff4e6b34358 (patch)
treeea83714901cd8c2e5eab570674c86e4d98aedac2
parent26e1cef6be20ec9eb7d3f1ed9d219192d5b83349 (diff)
downloadppe42-gcc-44c4af00bee3e89f65e006f0d191aff4e6b34358.tar.gz
ppe42-gcc-44c4af00bee3e89f65e006f0d191aff4e6b34358.zip
Fix date in entry.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123206 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--libgfortran/ChangeLog5
1 files changed, 1 insertions, 4 deletions
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 6c2d7bbd5e4..c3425893e00 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,4 @@
-<<<<<<< .mine
-2007-03-23 Jerry DeLisle <jvdelisle@gcc.gnu.org>
+2007-03-25 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/31199
*io/io.h: Add saved_pos to gfc_unit structure.
@@ -9,14 +8,12 @@
(finalze_transfer): Calculate max_pos for ADVANCE="no" and save it for
later use. If not ADVANCE="no" set saved_pos to zero.
-=======
2007-03-25 Thomas Koenig <tkoenig@gcc.gnu.org>
PR libfortran/31196
* intrinsics/reshape_generic.c (reshape_internal): Increment
correct variable.
->>>>>>> .r123204
2007-03-22 Jerry DeLisle <jvdelisle@gcc.gnu.org>
PR libgfortran/31052
OpenPOWER on IntegriCloud