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

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

projects / packages / o / openafs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: 438f95b) | patch

author	Sam Hartman <hartmans@debian.org>
	Sun, 14 Oct 2001 18:43:31 +0000 (18:43 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Sun, 14 Oct 2001 18:43:31 +0000 (18:43 +0000)
commit	96253cd278aa1a6992ed9a888d12e26eb8e0de1a
tree	e6fafb42d63b2158bfd871ed4707685087933e45	tree \| snapshot
parent	438f95bf9e12f60809efdf266f5c1fa11a92dae3	commit \| diff

Merge conflicts

17 files changed:

Makefile.in		diff \| blob \| history
src/afs/LINUX/osi_module.c		diff \| blob \| history
src/afs/LINUX/osi_vfs.h	[deleted file]	blob \| history
src/afs/VNOPS/afs_vnop_lookup.c		diff \| blob \| history
src/afs/afs.h		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.conf.linux		diff \| blob \| history
src/libafs/Makefile.common		diff \| blob \| history
src/libafs/MakefileProto.LINUX.in		diff \| blob \| history
src/ptserver/ptserver.c		diff \| blob \| history
src/rx/rx.c		diff \| blob \| history
src/rx/rx_packet.c		diff \| blob \| history
src/util/dirpath.c		diff \| blob \| history
src/viced/afsfileprocs.c		diff \| blob \| history
src/vol/partition.c		diff \| blob \| history