git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove conflict marker 

From-SVN: r174267
This commit is contained in:
Eric Botcazou 2011-05-26 08:53:05 +00:00
parent 50fed7bf1a
commit 1651e70348
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gcc/ChangeLog
View File

@ -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