diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-14 18:57:55 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-01-14 18:57:55 +0000 |
| commit | 605cbbd377d56231e666e8323cf4ae7f33221096 (patch) | |
| tree | a267b83fee5897814867ac439bd8626b8b465d8a /gcc/testsuite/ChangeLog-2008 | |
| parent | 76c7f98f1699b23bf8277d0c078e9db648c04d3c (diff) | |
| download | gcc-605cbbd377d56231e666e8323cf4ae7f33221096.tar.gz | |
Fix non-UTF-8 sequence in ChangeLog-2006 and left-over
conflict marker in testsuite/ChangeLog-2008.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@143380 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/testsuite/ChangeLog-2008')
| -rw-r--r-- | gcc/testsuite/ChangeLog-2008 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog-2008 b/gcc/testsuite/ChangeLog-2008 index e89a011549a..281c8a66527 100644 --- a/gcc/testsuite/ChangeLog-2008 +++ b/gcc/testsuite/ChangeLog-2008 @@ -3280,7 +3280,6 @@ PR tree-optimization/37508 * gcc.dg/tree-ssa/pr37508.c: New testcase. ->>>>>>> .r140590 2008-09-15 Aldy Hernandez <aldyh@redhat.com> * g++.old-deja/g++.brendan/crash16.C: Function name is the correct |