Commit f6555957 by Eric Christopher

Fix merge markers in ChangeLog.

From-SVN: r123933
parent 7c11b28c
...@@ -81,7 +81,6 @@ ...@@ -81,7 +81,6 @@
* g++.dg/warn/anonymous-namespace-1.C: New test * g++.dg/warn/anonymous-namespace-1.C: New test
* g++.dg/warn/anonymous-namespace-1.h: New test * g++.dg/warn/anonymous-namespace-1.h: New test
>>>>>>> .r123913
2007-04-14 Andrew Pinski <andrew_pinski@playstation.sony.com> 2007-04-14 Andrew Pinski <andrew_pinski@playstation.sony.com>
PR testsuite/31578 PR testsuite/31578
...@@ -119,7 +118,7 @@ ...@@ -119,7 +118,7 @@
* g++.dg/gomp/pr25874.C: Add dg-options. * g++.dg/gomp/pr25874.C: Add dg-options.
2007-04-14 Bernhard Fischer <aldot@gcc.gnu.org> 2007-04-14 Bernhard Fischer <aldot@gcc.gnu.org>
PR fortran/21061 PR fortran/21061
* gfortran.dg/warnings_are_errors_1.f90: New testcase. * gfortran.dg/warnings_are_errors_1.f90: New testcase.
* gfortran.dg/warnings_are_errors_1.f: New testcase. * gfortran.dg/warnings_are_errors_1.f: New testcase.
...@@ -251,7 +250,6 @@ ...@@ -251,7 +250,6 @@
* lib/target-supports.exp * lib/target-supports.exp
(check_effective_target_fstack_protector): Rewrite. (check_effective_target_fstack_protector): Rewrite.
>>>>>>> .r123860
2007-04-09 Mark Mitchell <mark@codesourcery.com> 2007-04-09 Mark Mitchell <mark@codesourcery.com>
PR c++/31449 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