From owner-cvs-all  Fri Nov 13 19:13:30 1998
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id TAA08981
          for cvs-all-outgoing; Fri, 13 Nov 1998 19:13:30 -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 TAA08976;
          Fri, 13 Nov 1998 19:13:29 -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 TAA25400;
	Fri, 13 Nov 1998 19:13:33 -0800 (PST)
Date: Fri, 13 Nov 1998 19:13:33 -0800 (PST)
Message-Id: <199811140313.TAA25400@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG
Subject: cvs commit: src/contrib/amd/amd amd.c src/contrib/amd/conf/nfs_prot
         nfs_prot_freebsd3.h src/contrib/amd/fixmount fixmount.c
         src/contrib/amd/hlfsd hlfsd.c src/contrib/amd/include am_defs.h
         src/contrib/amd/mk-amd-map mk-amd-map.c src/contrib/amd/wire-test ...
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

obrien      1998/11/13 19:13:33 PST

  Modified files:
    contrib/amd/amd      amd.c 
    contrib/amd/conf/nfs_prot nfs_prot_freebsd3.h 
    contrib/amd/fixmount fixmount.c 
    contrib/amd/hlfsd    hlfsd.c 
    contrib/amd/include  am_defs.h 
    contrib/amd/mk-amd-map mk-amd-map.c 
    contrib/amd/wire-test wire-test.c 
  Log:
  Clean up conflicts.
  
  Revision  Changes    Path
  1.3       +3 -3      src/contrib/amd/amd/amd.c
  1.4       +5 -4      src/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h
  1.3       +2 -2      src/contrib/amd/fixmount/fixmount.c
  1.3       +2 -2      src/contrib/amd/hlfsd/hlfsd.c
  1.3       +13 -1     src/contrib/amd/include/am_defs.h
  1.5       +116 -70   src/contrib/amd/mk-amd-map/mk-amd-map.c
  1.3       +2 -2      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