diff options
| author | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-03-26 03:26:51 +0000 |
|---|---|---|
| committer | Jerry DeLisle <jvdelisle@gcc.gnu.org> | 2007-03-26 03:26:51 +0000 |
| commit | 2ff0a77e973390e4c82a17620436553a33b081dd (patch) | |
| tree | ea83714901cd8c2e5eab570674c86e4d98aedac2 /libgfortran | |
| parent | beb6a65e7573a9178764a1844d052cdeeb529322 (diff) | |
| download | gcc-2ff0a77e973390e4c82a17620436553a33b081dd.zip gcc-2ff0a77e973390e4c82a17620436553a33b081dd.tar.gz gcc-2ff0a77e973390e4c82a17620436553a33b081dd.tar.bz2 | |
Fix date in entry.
From-SVN: r123206
Diffstat (limited to 'libgfortran')
| -rw-r--r-- | libgfortran/ChangeLog | 5 |
1 files changed, 1 insertions, 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 <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 |