Mailing-List: contact cygwin-developers-help AT cygwin DOT com; run by ezmlm List-Subscribe: List-Archive: List-Post: List-Help: , Sender: cygwin-developers-owner AT cygwin DOT com Delivered-To: mailing list cygwin-developers AT cygwin DOT com Subject: w32api merge From: Robert Collins To: cygwin-developers AT cygwin DOT com Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Mailer: Evolution/1.0 (Preview Release) Date: 25 Jan 2002 21:08:38 +1100 Message-Id: <1011953318.18172.23.camel@lifelesswks> Mime-Version: 1.0 X-OriginalArrivalTime: 25 Jan 2002 10:08:42.0595 (UTC) FILETIME=[44783B30:01C1A588] RCS file: /cvs/src/src/winsup/w32api/include/winnt.h,v retrieving revision 1.44 has been commmitted with a CVS conflict in it. I'm not sure which of the two you want Earnie, so I'm just alerting you. Rob