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 Message-ID: <02ed01c21b73$f9443120$6132bc3e@BABEL> From: "Conrad Scott" To: Subject: cygwin_daemon branch Date: Mon, 24 Jun 2002 12:40:43 +0100 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit X-Priority: 3 X-MSMail-Priority: Normal X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2600.0000 I broke the cygwin_daemon branch for an hour this morning but I've fixed it again. I merged the HEAD changes into the branch and merging Chris's renaming of the and files had the effect of copying the HEAD version of those files into the branch and losing the branch's versions. Which I wasn't expecting (or wanting). So, I've just patched things up again for anyone unlucky enough to have grabbed the branch at that point. Sorry about that and I've learnt yet another thing about CVS. // Conrad