Return-Path: Delivered-To: apmail-james-server-dev-archive@www.apache.org Received: (qmail 12844 invoked from network); 8 Feb 2004 22:19:28 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 8 Feb 2004 22:19:28 -0000 Received: (qmail 41236 invoked by uid 500); 8 Feb 2004 22:19:13 -0000 Delivered-To: apmail-james-server-dev-archive@james.apache.org Received: (qmail 41208 invoked by uid 500); 8 Feb 2004 22:19:13 -0000 Mailing-List: contact server-dev-help@james.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "James Developers List" Reply-To: "James Developers List" Delivered-To: mailing list server-dev@james.apache.org Received: (qmail 41187 invoked from network); 8 Feb 2004 22:19:13 -0000 Received: from unknown (HELO mta05-svc.ntlworld.com) (62.253.162.45) by daedalus.apache.org with SMTP; 8 Feb 2004 22:19:13 -0000 Received: from SSL009 ([81.96.206.164]) by mta05-svc.ntlworld.com (InterMail vM.4.01.03.37 201-229-121-137-20020806) with SMTP id <20040208221842.CFSQ9105.mta05-svc.ntlworld.com@SSL009> for ; Sun, 8 Feb 2004 22:18:42 +0000 Reply-To: From: "Steve Brewin" To: "James Developers List \(E-mail\)" Subject: FW: Merge progress? (was RE: New matcher to MAIN or 2.1 branch?) Date: Sun, 8 Feb 2004 22:19:22 -0000 Message-ID: <000f01c3ee91$9b573c40$0901a8c0@synsys.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Priority: 3 (Normal) X-MSMail-Priority: Normal X-Mailer: Microsoft Outlook CWS, Build 9.0.2416 (9.0.2911.0) X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2800.1106 Importance: Normal X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Noel J. Bergman wrote: > > I was going to commit some changes to 2_1_fcs in the next > day or so. Might > > it be better for me to hold off until after the merge? > > Actually, if you wouldn't mind, could you make sure that both > v2 and MAIN > are both up to date? If so, we'll pretty much be able to > ignore them except > for any Mailet API changes. OK. -- Steve --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org For additional commands, e-mail: server-dev-help@james.apache.org