aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMike Stump <mrs@gcc.gnu.org>2005-05-17 20:13:02 +0000
committerMike Stump <mrs@gcc.gnu.org>2005-05-17 20:13:02 +0000
commit7dc5e63544e434b07f0fcc0737a4caa371e5457b (patch)
tree88e9089b744fb13a43afb855333d7be9767172d8 /gcc
parent6e95543072475b1a36ff156f291db90a778678b5 (diff)
downloadgcc-7dc5e63544e434b07f0fcc0737a4caa371e5457b.zip
gcc-7dc5e63544e434b07f0fcc0737a4caa371e5457b.tar.gz
gcc-7dc5e63544e434b07f0fcc0737a4caa371e5457b.tar.bz2
Remove typo.
From-SVN: r99859
Diffstat (limited to 'gcc')
-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.