From 44c4af00bee3e89f65e006f0d191aff4e6b34358 Mon Sep 17 00:00:00 2001 From: jvdelisle Date: Mon, 26 Mar 2007 03:26:51 +0000 Subject: [PATCH] Fix date in entry. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123206 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgfortran/ChangeLog | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog index 6c2d7bb..c342589 100644 --- a/libgfortran/ChangeLog +++ b/libgfortran/ChangeLog @@ -1,5 +1,4 @@ -<<<<<<< .mine -2007-03-23 Jerry DeLisle +2007-03-25 Jerry DeLisle 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 PR libfortran/31196 * intrinsics/reshape_generic.c (reshape_internal): Increment correct variable. ->>>>>>> .r123204 2007-03-22 Jerry DeLisle PR libgfortran/31052 -- 2.7.4