projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: de40e1d)
remove > > > glitch
authorDale Johannesen <dalej@gcc.gnu.org>
Mon, 21 Oct 2002 21:58:15 +0000 (21:58 +0000)
committerDale Johannesen <dalej@gcc.gnu.org>
Mon, 21 Oct 2002 21:58:15 +0000 (21:58 +0000)
From-SVN: r58390

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40370bfd6af0c2a0a2d0119f2cd4980d27c761fa..6146ec03d2f5e727061b59bfe3889865745b0453 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -362,7 +362,6 @@ Sat Oct 19 10:46:52 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
        * doc/c-tree.texi: Update description of COND_EXPR tree nodes.
 
->>>>>>> 1.15743
 2002-10-17  Geoffrey Keating  <geoffk@apple.com>
 
        * config/rs6000/rs6000.h (HARD_REGNO_MODE_OK): Allow arbitrary modes