From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/59803 Path: main.gmane.org!not-for-mail From: =?utf-8?Q?Arne_J=C3=B8rgensen?= Newsgroups: gmane.emacs.gnus.general Subject: Re: CVS update of gnus/lisp (47 files) Date: Sun, 13 Feb 2005 17:14:11 +0100 Organization: Arne Joergensen -- http://arnested.dk/ Message-ID: <874qggfne4.fsf@seamus.arnested.dk> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: sea.gmane.org 1108498628 27644 80.91.229.2 (15 Feb 2005 20:17:08 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 15 Feb 2005 20:17:08 +0000 (UTC) Cc: "Miles Bader" Original-X-From: ding-owner+M8350@lists.math.uh.edu Tue Feb 15 21:17:07 2005 Original-Received: from malifon.math.uh.edu ([129.7.128.13]) by ciao.gmane.org with esmtp (Exim 4.43) id 1D196O-0005pb-OF for ding-account@gmane.org; Tue, 15 Feb 2005 21:15:21 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu ident=lists) by malifon.math.uh.edu with smtp (Exim 3.20 #1) id 1D195w-0000rf-00; Tue, 15 Feb 2005 14:14:52 -0600 Original-Received: from util2.math.uh.edu ([129.7.128.23]) by malifon.math.uh.edu with esmtp (Exim 3.20 #1) id 1D18xu-0000MB-07 for ding@lists.math.uh.edu; Tue, 15 Feb 2005 14:06:34 -0600 Original-Received: from quimby.gnus.org ([80.91.224.244]) by util2.math.uh.edu with esmtp (Exim 4.30) id 1D0MVu-0003iP-IX for ding@lists.math.uh.edu; Sun, 13 Feb 2005 10:22:26 -0600 Original-Received: from main.gmane.org ([80.91.229.2] helo=ciao.gmane.org) by quimby.gnus.org with esmtp (Exim 3.35 #1 (Debian)) id 1D0MVt-0000SD-00 for ; Sun, 13 Feb 2005 17:22:25 +0100 Original-Received: from root by ciao.gmane.org with local (Exim 4.43) id 1D0MTd-0004Wu-Oy for ding@gnus.org; Sun, 13 Feb 2005 17:20:05 +0100 Original-Received: from 213.237.94.152 ([213.237.94.152]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Feb 2005 17:20:05 +0100 Original-Received: from arne by 213.237.94.152 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 13 Feb 2005 17:20:05 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-To: ding@gnus.org Original-Lines: 24 Original-X-Complaints-To: usenet@sea.gmane.org X-Gmane-NNTP-Posting-Host: 213.237.94.152 X-Face: 5t,7/Y$&<1A_t.$vC2{pWZ{m@3_06;kcm]no{hgEL/}Uz(>XV6cl4}xO\v?-h3%>znNaZtq `~rf,GY1T%r=a.zH`hOb(-]'x)nI088Z&|e;V^h;/TShou User-Agent: Gnus/5.110003 (No Gnus v0.3) Emacs/22.0.50 (gnu/linux) Cancel-Lock: sha1:eyIQ45eh2SuqL9PXQJxzh2nrgN0= X-Spam-Score: -4.9 (----) Precedence: bulk Original-Sender: ding-owner@lists.math.uh.edu X-MailScanner-From: ding-owner+m8350@lists.math.uh.edu X-MailScanner-To: ding-account@gmane.org Xref: main.gmane.org gmane.emacs.gnus.general:59803 X-Report-Spam: http://spam.gmane.org/gmane.emacs.gnus.general:59803 "Miles Bader" writes: > Date: Sunday, February 13, 2005 @ 05:44:43 > Author: cvs > Path: /usr/local/cvsroot/gnus/lisp > > Modified: ChangeLog ChangeLog.2 binhex.el deuglify.el flow-fill.el > gnus-agent.el gnus-art.el gnus-cite.el gnus-delay.el > gnus-diary.el gnus-fun.el gnus-group.el gnus-int.el gnus-msg.el > gnus-registry.el gnus-score.el gnus-spec.el gnus-srvr.el > gnus-start.el gnus-sum.el gnus-util.el gnus-win.el gnus.el > imap.el mail-source.el message.el mm-decode.el mm-url.el > mm-uu.el mml-sec.el mml.el mml2015.el nndiary.el nnimap.el > nnmail.el pgg-def.el pop3.el sha1.el sieve.el smiley.el smime.el > spam-stat.el spam.el starttls.el tls.el utf7.el uudecode.el > > Revision: miles@gnu.org--gnu-2005/gnus--devo--0--patch-37 This introduced an unresolved conflict in gnus-agent.el into the CVS archive at quimby. Kind regards, -- Arne Jørgensen