Date: Fri, 13 Nov 1998 19:13:33 -0800 (PST) From: "David E. O'Brien" <obrien@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 ... Message-ID: <199811140313.TAA25400@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199811140313.TAA25400>