aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog1
1 files changed, 1 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e16a312..2baf95e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -248,6 +248,7 @@
scale_bbs_frequencies_int.
* tree-ssa-loop-ch.c (copy_loop_headers): Fix profiling info.
+>>>>>>> 2.7929
2005-03-18 Kazu Hirata <kazu@cs.umass.edu>
* config/m32r/m32r-protos.h: Remove the prototypes for