diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2009-07-20 12:38:04 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2009-07-20 12:38:04 +0200 |
| commit | 9e7c935a29fe3d44f60a40960ee4791aab285423 (patch) | |
| tree | 028d13e74ccd0016d27652de0bebea0a0ea6282f | |
| parent | 6a799f6e68fcbd39c77f43524629183afc687202 (diff) | |
| download | gcc-9e7c935a29fe3d44f60a40960ee4791aab285423.zip gcc-9e7c935a29fe3d44f60a40960ee4791aab285423.tar.gz gcc-9e7c935a29fe3d44f60a40960ee4791aab285423.tar.bz2 | |
ChangeLog: Remove conflict markers.
* ChangeLog: Remove conflict markers.
* testsuite/ChangeLog: Ditto.
From-SVN: r149805
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6053b54..e3818f3 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -133,7 +133,6 @@ * c-omp.c (c_finish_omp_atomic): Set DECL_CONTEXT on the temporary variable. ->>>>>>> .r149802 2009-07-17 Sandra Loosemore <sandra@codesourcery.com> * doc/service.texi (Service): Restore previously removed link, @@ -153,7 +152,6 @@ * gimplify.c (gimplify_conversion): Don't change non-conversions into VIEW_CONVERT_EXPR. ->>>>>>> .r149747 2009-07-16 Sandra Loosemore <sandra@codesourcery.com> * doc/extend.texi (Nested Functions): Replace broken link with @@ -213,9 +211,9 @@ 2009-07-16 Bingfeng Mei <bmei@broadcom.com> - * modulo-sched.c (sms_schedule): stage_count <= 1 as correct comparison - to skip unprofitable schedule - + * modulo-sched.c (sms_schedule): stage_count <= 1 as correct + comparison to skip unprofitable schedule + 2009-07-16 Simon Baldwin <simonb@google.com> * gcc.c (option_map): New flag -no-canonical-prefixes. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a311632..4bc5b0a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -56,7 +56,6 @@ * gcc.target/powerpc/asm-es-1.c: New test. * gcc.target/powerpc/asm-es-2.c: Likewise. ->>>>>>> .r149802 2009-07-17 Richard Guenther <rguenther@suse.de> PR c/40401 @@ -89,7 +88,6 @@ PR c++/40780 * g++.dg/template/ptrmem19.C: New test. ->>>>>>> .r149747 2009-07-17 Aldy Hernandez <aldyh@redhat.com> Manuel López-Ibáñez <manu@gcc.gnu.org> |