aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40370bf..6146ec0 100644
--- 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