diff options
| author | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2011-05-26 08:53:05 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2011-05-26 08:53:05 +0000 |
| commit | 1651e703484940d8ea0fd098c28b25c5b0e2f862 (patch) | |
| tree | dc69365b5b5d6ad4c3b7d712e3e5a3ab9a3ddf5b /gcc | |
| parent | 50fed7bf1a09778cc0cc75e270f2092cb71690da (diff) | |
| download | gcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.zip gcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.tar.gz gcc-1651e703484940d8ea0fd098c28b25c5b0e2f862.tar.bz2 | |
Remove conflict marker
From-SVN: r174267
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7f333e9..c60706c 100644 --- 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. |