aboutsummaryrefslogtreecommitdiff
path: root/gcc/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/ChangeLog')
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4ffd196..5d4be0b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -587,7 +587,6 @@ Mon May 12 11:32:53 CEST 2003 Jan Hubicka <jh@suse.cz>
(s390_function_arg): Likewise.
(s390_va_arg): Likewise
->>>>>>> 1.17806
2003-05-11 Nathan Sidwell <nathan@codesourcery.com>
* coverage.h (coverage_counter_alloc): New function.