projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 50fed7b)
Remove conflict marker
authorEric Botcazou <ebotcazou@gcc.gnu.org>
Thu, 26 May 2011 08:53:05 +0000 (08:53 +0000)
committerEric Botcazou <ebotcazou@gcc.gnu.org>
Thu, 26 May 2011 08:53:05 +0000 (08:53 +0000)
From-SVN: r174267

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7f333e99f44c1d886576f677dc0ad641679342a5..c60706c275df946584886abf110035aa037a917e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -191,7 +191,6 @@
        * ipa.c (function_and_variable_visibility): Only add to same
        comdat group list if DECL_ONE_ONLY.
 
->>>>>>> .r174265
 2011-05-25  Andrey Belevantsev  <abel@ispras.ru>
 
        PR rtl-optimization/49014
@@ -756,7 +755,7 @@
        TRUTH_AND_EXPR, TRUTH_OR_EXPR, and TRUTH_XOR_EXPR.
        (gimplify_expr): Move TRUTH_AND|OR|XOR_EXPR to its binary form.
 
-2011-05-19  Anatoly Sokolov <aesok@post.ru>
+2011-05-19  Anatoly Sokolov  <aesok@post.ru>
            Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/t-sol2 (sol2.o): Add $(TARGET_H) dependency.