Commit ed8a0bc4 by Jakub Jelinek

Fix non-UTF-8 sequence in ChangeLog-2006 and left-over

conflict marker in testsuite/ChangeLog-2008.

From-SVN: r143380
parent 96a995c4
...@@ -22671,7 +22671,7 @@ ...@@ -22671,7 +22671,7 @@
* basic-block.h: Remove the prototype for * basic-block.h: Remove the prototype for
partition_hot_cold_basic_blocks. partition_hot_cold_basic_blocks.
2006-01-16 Rafael Ávila de Espndola <rafael.espindola@gmail.com> 2006-01-16 Rafael Ávila de Espíndola <rafael.espindola@gmail.com>
* cppspec.c (lang_specific_spec_functions): Remove. * cppspec.c (lang_specific_spec_functions): Remove.
* gcc.c (lookup_spec_function): Use static_spec_functions directly. * gcc.c (lookup_spec_function): Use static_spec_functions directly.
......
...@@ -3280,7 +3280,6 @@ ...@@ -3280,7 +3280,6 @@
PR tree-optimization/37508 PR tree-optimization/37508
* gcc.dg/tree-ssa/pr37508.c: New testcase. * gcc.dg/tree-ssa/pr37508.c: New testcase.
>>>>>>> .r140590
2008-09-15 Aldy Hernandez <aldyh@redhat.com> 2008-09-15 Aldy Hernandez <aldyh@redhat.com>
* g++.old-deja/g++.brendan/crash16.C: Function name is the correct * g++.old-deja/g++.brendan/crash16.C: Function name is the correct
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment