From owner-cvs-include  Tue May 27 21:40:25 1997
Return-Path: <owner-cvs-include>
Received: (from root@localhost)
          by hub.freebsd.org (8.8.5/8.8.5) id VAA22882
          for cvs-include-outgoing; Tue, 27 May 1997 21:40:25 -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 VAA22674;
          Tue, 27 May 1997 21:38:46 -0700 (PDT)
From: Bill Paul <wpaul@FreeBSD.ORG>
Received: (from wpaul@localhost)
	by freefall.freebsd.org (8.8.5/8.8.5) id VAA10462;
	Tue, 27 May 1997 21:38:36 -0700 (PDT)
Date: Tue, 27 May 1997 21:38:36 -0700 (PDT)
Message-Id: <199705280438.VAA10462@freefall.freebsd.org>
To: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG, cvs-include@FreeBSD.ORG
Subject: cvs commit: src/include/rpcsvc Makefile crypt.x klm_prot.x nis.x
         nis_cache.x nis_callback.x nis_db.h nis_object.x nis_tags.h
         nislib.h nlm_prot.x rex.x rnusers.x rquota.x rstat.x rwall.x
         sm_inter.x spray.x yp.x yp_prot.h ypclnt.h yppasswd.x ...
Sender: owner-cvs-include@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

wpaul       1997/05/27 21:38:36 PDT

  Modified files:
    include/rpcsvc       Makefile crypt.x klm_prot.x nis.x 
                         nis_cache.x nis_callback.x nis_db.h 
                         nis_object.x nis_tags.h nislib.h 
                         nlm_prot.x rex.x rnusers.x rquota.x 
                         rstat.x rwall.x sm_inter.x spray.x yp.x 
                         yp_prot.h ypclnt.h yppasswd.x 
                         ypupdate_prot.x ypxfrd.x 
  Log:
  Resolve conflicts.
  
  Revision  Changes    Path
  1.15      +10 -7     src/include/rpcsvc/Makefile
  1.2       +0 -0      src/include/rpcsvc/crypt.x
  1.4       +1 -1      src/include/rpcsvc/klm_prot.x
  1.2       +0 -0      src/include/rpcsvc/nis.x
  1.2       +0 -0      src/include/rpcsvc/nis_cache.x
  1.2       +0 -0      src/include/rpcsvc/nis_callback.x
  1.2       +0 -0      src/include/rpcsvc/nis_db.h
  1.2       +0 -0      src/include/rpcsvc/nis_object.x
  1.2       +0 -0      src/include/rpcsvc/nis_tags.h
  1.2       +0 -0      src/include/rpcsvc/nislib.h
  1.4       +1 -1      src/include/rpcsvc/nlm_prot.x
  1.4       +1 -1      src/include/rpcsvc/rex.x
  1.4       +33 -2     src/include/rpcsvc/rnusers.x
  1.4       +1 -1      src/include/rpcsvc/rquota.x
  1.4       +1 -1      src/include/rpcsvc/rstat.x
  1.4       +49 -38    src/include/rpcsvc/rwall.x
  1.4       +1 -1      src/include/rpcsvc/sm_inter.x
  1.4       +1 -1      src/include/rpcsvc/spray.x
  1.8       +1 -1      src/include/rpcsvc/yp.x
  1.9       +1 -1      src/include/rpcsvc/yp_prot.h
  1.9       +1 -1      src/include/rpcsvc/ypclnt.h
  1.4       +6 -1      src/include/rpcsvc/yppasswd.x
  1.2       +0 -0      src/include/rpcsvc/ypupdate_prot.x
  1.5       +2 -2      src/include/rpcsvc/ypxfrd.x