gcc/gcc ChangeLog.profiling cfgexpand.c

[hubicka@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Branch: 	tree-profiling-branch
Changes by:	hubicka@gcc.gnu.org	2004-09-14 13:27:10

Modified files:
	gcc            : ChangeLog.profiling cfgexpand.c 

Log message:
	* cfgexpand.c: Fix merge problems.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.profiling.diff?cvsroot=gcc&only_with_tag=tree-profiling-branch&r1=1.1.2.56&r2=1.1.2.57
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/cfgexpand.c.diff?cvsroot=gcc&only_with_tag=tree-profiling-branch&r1=1.1.2.17&r2=1.1.2.18