X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2FChangeLog;h=2baf95e003ab8345a3a47c4ac9098dbde4ab9ed5;hp=e16a3125bee3e0ed421136db805e1272d0680ca5;hb=0f284b75afbf6aeb00c2cd79ddd7e9dd3a7306b5;hpb=3c619a6deee4fbd8438d40dd51ee543290be1c78;ds=sidebyside

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