diff options
| author | Richard Biener <rguenth@gcc.gnu.org> | 2007-07-02 13:29:57 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2007-07-02 13:29:57 +0000 |
| commit | 72ad03ef9fcc47d9bf7ae2234bed7498351a354f (patch) | |
| tree | 8e771d93dd0874ab698fb61824c0e5e928ee398a /gcc | |
| parent | 269ef14dfd9a5235f3569ba68d5efbb985349cb8 (diff) | |
| download | gcc-72ad03ef9fcc47d9bf7ae2234bed7498351a354f.zip gcc-72ad03ef9fcc47d9bf7ae2234bed7498351a354f.tar.gz gcc-72ad03ef9fcc47d9bf7ae2234bed7498351a354f.tar.bz2 | |
ChangeLog: Remove conflict marker, fix typo in date.
2007-07-02 Richard Guenther <rguenther@suse.de>
* testsuite/ChangeLog: Remove conflict marker, fix typo in date.
From-SVN: r126204
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a4cfc1f..4bb958f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -139,7 +139,7 @@ initialization and fix dg-final check - the initialization loop is vectorizable. -2007-067-01 Uros Bizjak <ubizjak@gmail.com> +2007-07-01 Uros Bizjak <ubizjak@gmail.com> Volker Reichelt <reichelt@netcologne.de> PR middle-end/32559 @@ -291,7 +291,6 @@ PR c++/32111 * g++.dg/other/friend5.C: New test. ->>>>>>> .r126155 2007-06-25 Paul Thomas <pault@gcc.gnu.org> PR fortran/32464 |