From owner-cvs-src@FreeBSD.ORG Sun Jun 3 17:02:36 2007 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 131D916A468; Sun, 3 Jun 2007 17:02:36 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 05B8713C455; Sun, 3 Jun 2007 17:02:36 +0000 (UTC) (envelope-from ume@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l53H2Z5G089482; Sun, 3 Jun 2007 17:02:35 GMT (envelope-from ume@repoman.freebsd.org) Received: (from ume@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l53H2ZxQ089469; Sun, 3 Jun 2007 17:02:35 GMT (envelope-from ume) Message-Id: <200706031702.l53H2ZxQ089469@repoman.freebsd.org> From: Hajimu UMEMOTO Date: Sun, 3 Jun 2007 17:02:34 +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 - 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Jun 2007 17:02:36 -0000 ume 2007-06-03 17:02:34 UTC FreeBSD src repository src - Imported sources Update of /home/ncvs/src In directory repoman.freebsd.org:/tmp/cvs-serv89319 Log Message: Vendor import of BIND 9.4.1 Status: Vendor Tag: ISC Release Tags: BIND_9_4_1 U src/lib/libc/include/resolv_mt.h U src/lib/libc/include/isc/eventlib.h C src/lib/libc/inet/inet_addr.c U src/lib/libc/inet/inet_cidr_ntop.c C src/lib/libc/inet/inet_cidr_pton.c C src/lib/libc/inet/inet_lnaof.c C src/lib/libc/inet/inet_makeaddr.c C src/lib/libc/inet/inet_net_ntop.c C src/lib/libc/inet/inet_net_pton.c C src/lib/libc/inet/inet_neta.c C src/lib/libc/inet/inet_netof.c C src/lib/libc/inet/inet_network.c C src/lib/libc/inet/inet_ntoa.c C src/lib/libc/inet/inet_ntop.c C src/lib/libc/inet/inet_pton.c C src/lib/libc/inet/nsap_addr.c C src/lib/libc/isc/ev_streams.c C src/lib/libc/isc/ev_timers.c C src/lib/libc/isc/eventlib_p.h U src/lib/libc/nameser/ns_name.c U src/lib/libc/nameser/ns_netint.c U src/lib/libc/nameser/ns_parse.c C src/lib/libc/nameser/ns_print.c C src/lib/libc/nameser/ns_samedomain.c U src/lib/libc/nameser/ns_ttl.c C src/lib/libc/resolv/herror.c U src/lib/libc/resolv/mtctxres.c C src/lib/libc/resolv/res_comp.c C src/lib/libc/resolv/res_data.c C src/lib/libc/resolv/res_debug.c U src/lib/libc/resolv/res_debug.h C src/lib/libc/resolv/res_findzonecut.c C src/lib/libc/resolv/res_init.c C src/lib/libc/resolv/res_mkquery.c C src/lib/libc/resolv/res_mkupdate.c U src/lib/libc/resolv/res_private.h C src/lib/libc/resolv/res_query.c C src/lib/libc/resolv/res_send.c C src/lib/libc/resolv/res_update.c C src/include/res_update.h C src/include/resolv.h C src/include/arpa/nameser.h C src/include/arpa/inet.h C src/include/arpa/nameser_compat.h 34 conflicts created by this import. Use the following command to help the merge: cvs checkout -jISC:yesterday -jISC src