From owner-freebsd-commit  Sat Jan  6 21:53:35 1996
Return-Path: owner-commit
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17660
          for freebsd-commit-outgoing; Sat, 6 Jan 1996 21:53:35 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17649
          for cvs-all-outgoing; Sat, 6 Jan 1996 21:53:30 -0800 (PST)
Received: (from root@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17639
          for cvs-usrsbin-outgoing; Sat, 6 Jan 1996 21:53:27 -0800 (PST)
Received: (from peter@localhost)
          by freefall.freebsd.org (8.7.3/8.7.3) id VAA17632
          Sat, 6 Jan 1996 21:53:26 -0800 (PST)
Date: Sat, 6 Jan 1996 21:53:26 -0800 (PST)
From: Peter Wemm <peter>
Message-Id: <199601070553.VAA17632@freefall.freebsd.org>
To: CVS-committers, cvs-usrsbin
Subject: cvs commit: src/usr.sbin/nslookup getinfo.c main.c subr.c
Sender: owner-commit@FreeBSD.ORG
Precedence: bulk

peter       96/01/06 21:53:25

  Modified:    usr.sbin/nslookup  getinfo.c main.c subr.c
  Log:
  Merge nslookup conflicts from 4.9.3-rel import
  
  Revision  Changes    Path
  1.4       +26 -11    src/usr.sbin/nslookup/getinfo.c
  1.4       +2 -2      src/usr.sbin/nslookup/main.c
  1.6       +3 -3      src/usr.sbin/nslookup/subr.c