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 127f104..1dffbed 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -81,7 +81,6 @@
* cfgloopanal.c (just_once_each_iteration_p): Make the loop argument
const.
->>>>>>> 2.8834
2005-05-17 Zdenek Dvorak <dvorakz@suse.cz>
* ggc-page.c (ggc_alloc_stat): Record amount of memory allocated.