From owner-cvs-src@FreeBSD.ORG Tue Mar 21 15:57:59 2006 Return-Path: <owner-cvs-src@FreeBSD.ORG> X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 79F1416A41F; Tue, 21 Mar 2006 15:57:59 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3503443D45; Tue, 21 Mar 2006 15:57:59 +0000 (GMT) (envelope-from ume@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2LFvxGs056695; Tue, 21 Mar 2006 15:57:59 GMT (envelope-from ume@repoman.freebsd.org) Received: (from ume@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2LFvxVX056694; Tue, 21 Mar 2006 15:57:59 GMT (envelope-from ume) Message-Id: <200603211557.k2LFvxVX056694@repoman.freebsd.org> From: Hajimu UMEMOTO <ume@FreeBSD.org> Date: Tue, 21 Mar 2006 15:57:59 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: ISC Cc: Subject: cvs commit: src/include - Imported sources X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>, <mailto:cvs-src-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/cvs-src> List-Post: <mailto:cvs-src@freebsd.org> List-Help: <mailto:cvs-src-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>, <mailto:cvs-src-request@freebsd.org?subject=subscribe> X-List-Received-Date: Tue, 21 Mar 2006 15:57:59 -0000 ume 2006-03-21 15:57:59 UTC FreeBSD src repository src/include - Imported sources Update of /home/ncvs/src/include In directory repoman.freebsd.org:/tmp/cvs-serv56674 Log Message: Vendor import of BIND 9.3.2 Status: Vendor Tag: ISC Release Tags: BIND_9_3_2 C src/include/resolv.h C src/include/arpa/nameser.h C src/include/arpa/inet.h C src/include/arpa/nameser_compat.h 4 conflicts created by this import. Use the following command to help the merge: cvs checkout -jISC:yesterday -jISC src/include