procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix merge markers in ChangeLog.

Browse source 
From-SVN: r123933
This commit is contained in:
Eric Christopher 2007-04-17 22:47:58 +00:00
parent 7c11b28c57
commit f65559575d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/testsuite/ChangeLog
View file

@ -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
@ -119,7 +118,7 @@
* g++.dg/gomp/pr25874.C: Add dg-options.
2007-04-14 Bernhard Fischer <aldot@gcc.gnu.org>
PR fortran/21061
* gfortran.dg/warnings_are_errors_1.f90: New testcase.
* gfortran.dg/warnings_are_errors_1.f: New testcase.
@ -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