From owner-cvs-include  Tue May 27 21:47:01 1997
Return-Path: <owner-cvs-include>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id VAA23144
          for cvs-include-outgoing; Tue, 27 May 1997 21:47:01 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.cdrom.com [204.216.27.21])
          by hub.freebsd.org (8.8.5/8.8.5) with ESMTP id VAA23071;
          Tue, 27 May 1997 21:45:27 -0700 (PDT)
From: Bill Paul <wpaul@FreeBSD.ORG>
Received: (from wpaul@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id VAA10829;
	Tue, 27 May 1997 21:45:17 -0700 (PDT)
Date: Tue, 27 May 1997 21:45:17 -0700 (PDT)
Message-Id: <199705280445.VAA10829@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-include@FreeBSD.ORG
Subject: cvs commit: src/include/rpc auth.h auth_unix.h clnt.h pmap_clnt.h
         pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h svc.h svc_auth.h types.h
         xdr.h
Sender: owner-cvs-include@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

wpaul       1997/05/27 21:45:17 PDT

  Modified files:
    include/rpc          auth.h auth_unix.h clnt.h pmap_clnt.h 
                         pmap_prot.h pmap_rmt.h rpc.h rpc_msg.h 
                         svc.h svc_auth.h types.h xdr.h 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.13      +80 -3     src/include/rpc/auth.h
  1.9       +3 -1      src/include/rpc/auth_unix.h
  1.10      +51 -3     src/include/rpc/clnt.h
  1.10      +1 -1      src/include/rpc/pmap_clnt.h
  1.9       +1 -1      src/include/rpc/pmap_prot.h
  1.9       +1 -1      src/include/rpc/pmap_rmt.h
  1.9       +1 -3      src/include/rpc/rpc.h
  1.11      +1 -1      src/include/rpc/rpc_msg.h
  1.12      +5 -3      src/include/rpc/svc.h
  1.9       +3 -1      src/include/rpc/svc_auth.h
  1.8       +1 -1      src/include/rpc/types.h
  1.10      +2 -1      src/include/rpc/xdr.h