From owner-freebsd-commit Mon Oct 23 05:14:45 1995 Return-Path: owner-commit Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id FAA04787 for freebsd-commit-outgoing; Mon, 23 Oct 1995 05:14:45 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id FAA04774 for cvs-all-outgoing; Mon, 23 Oct 1995 05:14:37 -0700 Received: (from root@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id FAA04764 for cvs-usrsbin-outgoing; Mon, 23 Oct 1995 05:14:35 -0700 Received: (from peter@localhost) by freefall.freebsd.org (8.6.12/8.6.6) id FAA04755 ; Mon, 23 Oct 1995 05:14:31 -0700 Date: Mon, 23 Oct 1995 05:14:31 -0700 From: Peter Wemm Message-Id: <199510231214.FAA04755@freefall.freebsd.org> To: CVS-commiters, cvs-usrsbin Subject: cvs commit: src/usr.sbin/nslookup - Imported sources Sender: owner-commit@FreeBSD.org Precedence: bulk peter 95/10/23 05:14:30 Branch: usr.sbin/nslookup 1.1.1 Log: Import nslookup from bind-4.9.3-beta26 (update from beta24) Status: Vendor Tag: VIXIE Release Tags: v4_9_3_beta26 U src/usr.sbin/nslookup/commands.l U src/usr.sbin/nslookup/debug.c U src/usr.sbin/nslookup/getinfo.c U src/usr.sbin/nslookup/list.c U src/usr.sbin/nslookup/main.c U src/usr.sbin/nslookup/nslookup.help U src/usr.sbin/nslookup/pathnames.h U src/usr.sbin/nslookup/res.h U src/usr.sbin/nslookup/send.c U src/usr.sbin/nslookup/skip.c C src/usr.sbin/nslookup/subr.c 1 conflicts created by this import. Use the following command to help the merge: ccvs checkout -jVIXIE:yesterday -jVIXIE src/usr.sbin/nslookup