From 0f284b75afbf6aeb00c2cd79ddd7e9dd3a7306b5 Mon Sep 17 00:00:00 2001
From: nickc <nickc@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon, 21 Mar 2005 13:08:39 +0000
Subject: [PATCH] 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
---
 gcc/ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e16a3125bee..2baf95e003a 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
-- 
2.11.0