Oops - forgot to include ChangeLog entry for m32r patch

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@96796 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e16a3125bee3e0ed421136db805e1272d0680ca5..2baf95e003ab8345a3a47c4ac9098dbde4ab9ed5 100644 (file)
--- 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