projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 048a75f)
Oops - forgot to include ChangeLog entry for m32r patch
authorNick Clifton <nickc@gcc.gnu.org>
Mon, 21 Mar 2005 13:08:39 +0000 (13:08 +0000)
committerNick Clifton <nickc@gcc.gnu.org>
Mon, 21 Mar 2005 13:08:39 +0000 (13:08 +0000)
From-SVN: r96796

gcc/ChangeLog patch | blob | history

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