diff options
| author | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-01-14 19:57:55 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2009-01-14 19:57:55 +0100 |
| commit | ed8a0bc47c8aa359f417360d8443770b02327e1c (patch) | |
| tree | a267b83fee5897814867ac439bd8626b8b465d8a /gcc | |
| parent | 96a995c4af75dfe581c51fec25b42b5a96be1bb3 (diff) | |
| download | gcc-ed8a0bc47c8aa359f417360d8443770b02327e1c.zip gcc-ed8a0bc47c8aa359f417360d8443770b02327e1c.tar.gz gcc-ed8a0bc47c8aa359f417360d8443770b02327e1c.tar.bz2 | |
Fix non-UTF-8 sequence in ChangeLog-2006 and left-over
conflict marker in testsuite/ChangeLog-2008.
From-SVN: r143380
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog-2006 | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog-2008 | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gcc/ChangeLog-2006 b/gcc/ChangeLog-2006 index 00d47c2..d57f425 100644 --- a/gcc/ChangeLog-2006 +++ b/gcc/ChangeLog-2006 @@ -22671,7 +22671,7 @@ * basic-block.h: Remove the prototype for partition_hot_cold_basic_blocks. -2006-01-16 Rafael Ávila de Esp�ndola <rafael.espindola@gmail.com> +2006-01-16 Rafael Ávila de Espíndola <rafael.espindola@gmail.com> * cppspec.c (lang_specific_spec_functions): Remove. * gcc.c (lookup_spec_function): Use static_spec_functions directly. diff --git a/gcc/testsuite/ChangeLog-2008 b/gcc/testsuite/ChangeLog-2008 index e89a011..281c8a6 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 |