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: a507b3f) | patch

author	Sam Hartman <hartmans@debian.org>
	Tue, 22 Jan 2002 20:29:45 +0000 (20:29 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Tue, 22 Jan 2002 20:29:45 +0000 (20:29 +0000)
commit	3ec1103d2737f7a19e87798e591df598884cf180
tree	d5dc02bf5c205541db52d8c48396d80580915c09	tree \| snapshot
parent	a507b3fcaefb74a9d7cfdf63082138cb21c43ab9	commit \| diff

Merge conflicts

12 files changed:

src/WINNT/afs_setup_utils/_isuser/_IsUser.dep	[deleted file]	blob \| history
src/afs/LINUX/osi_machdep.h		diff \| blob \| history
src/afs/LINUX/osi_vnodeops.c		diff \| blob \| history
src/afs/Makefile.in		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/bozo/bosoprocs.c		diff \| blob \| history
src/libafs/redhat.sh	[deleted file]	blob \| history
src/rx/rx.c		diff \| blob \| history
src/util/dirpath.c		diff \| blob \| history
src/viced/afsfileprocs.c		diff \| blob \| history