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: 54ec4e0) | patch

author	Sam Hartman <hartmans@debian.org>
	Fri, 2 Aug 2002 04:57:39 +0000 (04:57 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Fri, 2 Aug 2002 04:57:39 +0000 (04:57 +0000)
commit	f53ebe3ef466ef736adcd1d6744ba2d9d4731d95
tree	f1a75a2f0c424fd4cf0929186dbe5ef4fce2fc05	tree \| snapshot
parent	54ec4e0a5eb8f51ca15471a206177b875fe32e8b	commit \| diff

Merge conflicts

18 files changed:

Makefile.in		diff \| blob \| history
src/afs/LINUX/osi_machdep.h		diff \| blob \| history
src/afs/LINUX/osi_misc.c		diff \| blob \| history
src/afs/LINUX/osi_vnodeops.c		diff \| blob \| history
src/afs/Makefile.in		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.h		diff \| blob \| history
src/afs/afs_call.c		diff \| blob \| history
src/afs/afs_pioctl.c		diff \| blob \| history
src/config/param.i386_linux22.h		diff \| blob \| history
src/config/param.i386_linux24.h		diff \| blob \| history
src/config/param.ppc_linux22.h		diff \| blob \| history
src/config/param.ppc_linux24.h		diff \| blob \| history
src/config/param.sparc64_linux22.h		diff \| blob \| history
src/config/param.sparc_linux22.h		diff \| blob \| history
src/libafs/Makefile.common		diff \| blob \| history
src/vol/partition.c		diff \| blob \| history