projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 91088dd)
conflict
authorJason Merrill <jason@gcc.gnu.org>
Fri, 8 Jun 2001 18:14:27 +0000 (14:14 -0400)
committerJason Merrill <jason@gcc.gnu.org>
Fri, 8 Jun 2001 18:14:27 +0000 (14:14 -0400)
From-SVN: r43038

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 984633dcb037131d16497fb2d2514b6ef2454ee7..eca3773a2a8228fdc6c9c4a60a07c8d4f60a0088 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -176,7 +176,6 @@ Thu Jun  7 12:12:58 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
        * emit-rtl.c (operand_subword): Remove unused variable.
 
->>>>>>> 1.10284
 Wed Jun  6 14:51:05 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
        * i386.md (floatdi?f): Avoid usinf of SSE instructions