projects / platform / upstream / linaro-gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b812c14)
eliminate conflict indicator
authorkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 16 Oct 2003 22:38:32 +0000 (22:38 +0000)
committerkcook <kcook@138bc75d-0d04-0410-961f-82ee72b054a4>
Thu, 16 Oct 2003 22:38:32 +0000 (22:38 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72583 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bc4e49c..836c8f5 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -55,7 +55,6 @@
        (machopic_legitimize_pic_address): Improve codegen in dynamic-no-pic
        case.
 
->>>>>>> 2.1435
 2003-10-15  Gábor Lóki  <alga@rgai.hu>
 
        * fold-const.c (tree_swap_operands_p): Disable some features
Domain: System / Toolchain;