src/winsup/w32api ChangeLog include/winnt.h

[earnie@cygwin.com]

CVSROOT:	/cvs/src
Module name:	src
Changes by:	earnie@sources.redhat.com	2002-01-25 05:13:56

Modified files:
	winsup/w32api  : ChangeLog 
	winsup/w32api/include: winnt.h 

Log message:
	* include/winnt.h: Remove merge conflict.

Patches:
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/winsup/w32api/ChangeLog.diff?cvsroot=src&r1=1.144&r2=1.145
http://sources.redhat.com/cgi-bin/cvsweb.cgi/src/winsup/w32api/include/winnt.h.diff?cvsroot=src&r1=1.44&r2=1.45