From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7952 invoked from network); 20 Jul 2000 15:57:32 -0000 Received: from sunsite.auc.dk (130.225.51.30) by ns1.primenet.com.au with SMTP; 20 Jul 2000 15:57:32 -0000 Received: (qmail 6790 invoked by alias); 20 Jul 2000 15:57:16 -0000 Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 12325 Received: (qmail 6782 invoked from network); 20 Jul 2000 15:57:13 -0000 From: "Bart Schaefer" Message-Id: <1000720155553.ZM2094@candle.brasslantern.com> Date: Thu, 20 Jul 2000 15:55:53 +0000 X-Mailer: Z-Mail (5.0.0 30July97) To: zsh-workers@sunsite.auc.dk Subject: ChangeLog was messed up at some point MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii I just did a "cvs update" and discovered that a merge conflict had been improperly resolved at some point recently. This resulted in at least duplication of a lot of ChangeLog entries; it may have caused lossage that I wasn't able to detect. I fixed it up as best I was able and have committed the result, but anyone who has made a change in the last few days should look through to see if your log entries are missing. -- Bart Schaefer Brass Lantern Enterprises http://www.well.com/user/barts http://www.brasslantern.com Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net