Received: by mail.netbsd.org (Postfix, from userid 605) id 3099414A360; Sun, 19 Feb 2012 17:49:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7ECC214A3B9 for ; Sun, 19 Feb 2012 17:49:10 +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 BdIUp168igrW for ; Sun, 19 Feb 2012 17:49:09 +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 A908714A360 for ; Sun, 19 Feb 2012 17:49:09 +0000 (UTC) Received: by cvs.netbsd.org (Postfix, from userid 500) id 9ACDF175DD; Sun, 19 Feb 2012 17:49:09 +0000 (UTC) MIME-Version: 1.0 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Date: Sun, 19 Feb 2012 17:49:09 +0000 From: "Matthias Scheler" Subject: CVS commit: src/external/bsd/pkg_install/dist/lib To: source-changes@NetBSD.org X-Mailer: log_accum Message-Id: <20120219174909.9ACDF175DD@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 Feb 19 17:49:09 UTC 2012 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c pkg_summary.5 version.h Log Message: Resolve conflicts from last import. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/license.c cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkg_summary.5 cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/version.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.