Date: Tue, 27 May 1997 21:38:36 -0700 (PDT) From: Bill Paul <wpaul@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 ... Message-ID: <199705280438.VAA10462@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199705280438.VAA10462>