Received: by mail.netbsd.org (Postfix, from userid 605) id 661F514A6C2; Sun, 31 Jul 2011 10:05:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D665114A6BE for ; Sun, 31 Jul 2011 10:05:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at NetBSD.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.NetBSD.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id fGLyMHz6sr7X for ; Sun, 31 Jul 2011 10:05:05 +0000 (UTC) Received: from cvs.netbsd.org (cvs.NetBSD.org [IPv6:2001:4f8:3:7:2e0:81ff:fe30:95bd]) by mail.netbsd.org (Postfix) with ESMTP id 1C9BA14A6B9 for ; Sun, 31 Jul 2011 10:05:05 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 0A333175DD; Sun, 31 Jul 2011 10:05:05 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Sun, 31 Jul 2011 10:05:05 +0000 From: "Matthias Scheler" Subject: CVS commit: src/external/ibm-public/postfix/dist To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20110731100505.0A333175DD@cvs.netbsd.org> Sender: source-changes-owner@NetBSD.org List-Id: source-changes.NetBSD.org Precedence: bulk Reply-To: source-changes-d@NetBSD.org Mail-Reply-To: "Matthias Scheler" Mail-Followup-To: source-changes-d@NetBSD.org Module Name: src Committed By: tron Date: Sun Jul 31 10:05:04 UTC 2011 Modified Files: src/external/ibm-public/postfix/dist: makedefs postfix-install src/external/ibm-public/postfix/dist/html: TLS_README.html postconf.5.html src/external/ibm-public/postfix/dist/man/man5: postconf.5 src/external/ibm-public/postfix/dist/proto: postconf.proto Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/ibm-public/postfix/dist/makedefs cvs rdiff -u -r1.2 -r1.3 src/external/ibm-public/postfix/dist/postfix-install cvs rdiff -u -r1.4 -r1.5 \ src/external/ibm-public/postfix/dist/html/TLS_README.html cvs rdiff -u -r1.7 -r1.8 \ src/external/ibm-public/postfix/dist/html/postconf.5.html cvs rdiff -u -r1.7 -r1.8 \ src/external/ibm-public/postfix/dist/man/man5/postconf.5 cvs rdiff -u -r1.7 -r1.8 \ src/external/ibm-public/postfix/dist/proto/postconf.proto Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.