OSDN Git Service

* ChangeLog: Remove conflict markers.
authoruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 20 Jul 2009 10:38:04 +0000 (10:38 +0000)
committeruros <uros@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 20 Jul 2009 10:38:04 +0000 (10:38 +0000)
* testsuite/ChangeLog: Ditto.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@149805 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/testsuite/ChangeLog

index 6053b54..e3818f3 100644 (file)
        * 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,
        * 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
 
 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.
index a311632..4bc5b0a 100644 (file)
@@ -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>