From owner-cvs-all  Wed Jan 13 12:18:13 1999
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id MAA18011
          for cvs-all-outgoing; Wed, 13 Jan 1999 12:04:39 -0800 (PST)
          (envelope-from owner-cvs-all@FreeBSD.ORG)
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id MAA17996;
          Wed, 13 Jan 1999 12:04:36 -0800 (PST)
          (envelope-from obrien@FreeBSD.org)
From: "David E. O'Brien" <obrien@FreeBSD.ORG>
Received: (from obrien@localhost)
	by freefall.freebsd.org (8.8.8/8.8.5) id MAA16993;
	Wed, 13 Jan 1999 12:04:00 -0800 (PST)
Date: Wed, 13 Jan 1999 12:04:00 -0800 (PST)
Message-Id: <199901132004.MAA16993@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: src/contrib/amd/amd amd.c amq_subr.c get_args.c
         srvr_nfs.c src/contrib/amd/amq amq.c src/contrib/amd/conf/nfs_prot
         nfs_prot_freebsd2.h nfs_prot_freebsd3.h src/contrib/amd/fixmount
         fixmount.c src/contrib/amd/fsinfo fsinfo.c src/contrib/amd/hlfsd ...
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1999/01/13 12:04:00 PST

  Modified files:
    contrib/amd/amd      amd.c amq_subr.c get_args.c srvr_nfs.c 
    contrib/amd/amq      amq.c 
    contrib/amd/conf/nfs_prot nfs_prot_freebsd2.h 
                              nfs_prot_freebsd3.h 
    contrib/amd/fixmount fixmount.c 
    contrib/amd/fsinfo   fsinfo.c 
    contrib/amd/hlfsd    hlfsd.c homedir.c 
    contrib/amd/include  am_defs.h 
    contrib/amd/mk-amd-map mk-amd-map.c 
    contrib/amd/wire-test wire-test.c 
  Log:
  Fix conflicts.
  
  Revision  Changes    Path
  1.4       +27 -12    src/contrib/amd/amd/amd.c
  1.3       +4 -4      src/contrib/amd/amd/amq_subr.c
  1.3       +9 -7      src/contrib/amd/amd/get_args.c
  1.3       +12 -16    src/contrib/amd/amd/srvr_nfs.c
  1.3       +43 -28    src/contrib/amd/amq/amq.c
  1.3       +2 -2      src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h
  1.5       +20 -57    src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
  1.4       +6 -3      src/contrib/amd/fixmount/fixmount.c
  1.3       +7 -4      src/contrib/amd/fsinfo/fsinfo.c
  1.4       +44 -36    src/contrib/amd/hlfsd/hlfsd.c
  1.3       +3 -3      src/contrib/amd/hlfsd/homedir.c
  1.4       +23 -10    src/contrib/amd/include/am_defs.h
  1.6       +8 -4      src/contrib/amd/mk-amd-map/mk-amd-map.c
  1.4       +13 -5     src/contrib/amd/wire-test/wire-test.c

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message