diff options
| -rw-r--r-- | libgfortran/ChangeLog | 5 |
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 |
