diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2009-01-14 21:22:53 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2009-01-14 21:22:53 +0000 |
| commit | 3e55cc6f7c4e97f38555873046f6b3880f102a25 (patch) | |
| tree | b579d0cb7982d5c86b0aaa2ab27b9a82e84773c1 | |
| parent | 765ec70c92c6241242fb5a18e55b41633fac6831 (diff) | |
| download | gcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.zip gcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.tar.gz gcc-3e55cc6f7c4e97f38555873046f6b3880f102a25.tar.bz2 | |
ChangeLog-2007: Clean out svn merge droppings.
2009-01-14 Steven G. Kargl <kargl@gcc.gnu.org>
* ChangeLog-2007: Clean out svn merge droppings.
From-SVN: r143385
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog-2007 | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index b3d1799..d4eae5e 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2009-01-14 Steven G. Kargl <kargl@gcc.gnu.org> + + * ChangeLog-2007: Clean out svn merge droppings. + 2009-01-10 Paul Thomas <pault@gcc.gnu.org> PR fortran/38763 diff --git a/gcc/fortran/ChangeLog-2007 b/gcc/fortran/ChangeLog-2007 index 9c34c79..4597cb5 100644 --- a/gcc/fortran/ChangeLog-2007 +++ b/gcc/fortran/ChangeLog-2007 @@ -87,7 +87,6 @@ * module.c (read_module): Check sym->module is there before using it in a string comparison. ->>>>>>> .r131138 2007-12-20 Tobias Burnus <burnus@net-b.de> PR fortran/34482 |