gcc/gcc ChangeLog

[neil@gcc.gnu.org]

CVSROOT:	/cvs/gcc
Module name:	gcc
Changes by:	neil@gcc.gnu.org	2001-07-09 22:54:41

Modified files:
	gcc            : ChangeLog 

Log message:
	* ChangeLog: Resolve conflict.

Patches:
http://gcc.gnu.org/cgi-bin/cvsweb.cgi/gcc/gcc/ChangeLog.diff?cvsroot=gcc&r1=1.10599&r2=1.10600