git.michaelhowe.org Git - packages/o/openafs.git/commit

]> git.michaelhowe.org Git - packages/o/openafs.git/commit

author	Sam Hartman <hartmans@debian.org>
	Sun, 15 Jul 2001 07:22:32 +0000 (07:22 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Sun, 15 Jul 2001 07:22:32 +0000 (07:22 +0000)
commit	5b7caeaf1207715b00251d75c4ea994e651e49cf
tree	4786dfe8140317fb791106b07ccae51f2b666203	tree \| snapshot
parent	d2e3ff14e53dc8c58b5af8dfeb0088e354f5f7ce	commit \| diff

Merge conflicts

26 files changed:

Makefile.in		diff \| blob \| history
configure.in		diff \| blob \| history
src/afs/LINUX/osi_cred.c		diff \| blob \| history
src/afs/LINUX/osi_file.c		diff \| blob \| history
src/afs/LINUX/osi_misc.c		diff \| blob \| history
src/afs/LINUX/osi_module.c		diff \| blob \| history
src/afs/LINUX/osi_vnodeops.c		diff \| blob \| history
src/afs/VNOPS/afs_vnop_lookup.c		diff \| blob \| history
src/afs/VNOPS/afs_vnop_readdir.c		diff \| blob \| history
src/afs/afs_call.c		diff \| blob \| history
src/afs/afs_daemons.c		diff \| blob \| history
src/afs/afs_pioctl.c		diff \| blob \| history
src/afsd/afs.ppc_darwin.plist	[deleted file]	blob \| history
src/config/Makefile.i386_linux22.in		diff \| blob \| history
src/config/Makefile.version-NOCML	[deleted file]	blob \| history
src/lwp/lwp.c		diff \| blob \| history
src/lwp/preempt.c		diff \| blob \| history
src/lwp/process.c		diff \| blob \| history
src/pam/Makefile	[deleted file]	blob \| history
src/ptserver/pt_util.c		diff \| blob \| history
src/ptserver/ptserver.c		diff \| blob \| history
src/util/dirpath.c		diff \| blob \| history
src/venus/Makefile		diff \| blob \| history
src/venus/fstrace.c		diff \| blob \| history
src/vol/partition.c		diff \| blob \| history
src/volser/volmain.c		diff \| blob \| history