Commit f6555957 by Eric Christopher

Fix merge markers in ChangeLog.

From-SVN: r123933
parent 7c11b28c
......@@ -81,7 +81,6 @@
* g++.dg/warn/anonymous-namespace-1.C: New test
* g++.dg/warn/anonymous-namespace-1.h: New test
>>>>>>> .r123913
2007-04-14 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR testsuite/31578
......@@ -251,7 +250,6 @@
* lib/target-supports.exp
(check_effective_target_fstack_protector): Rewrite.
>>>>>>> .r123860
2007-04-09 Mark Mitchell <mark@codesourcery.com>
PR c++/31449
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