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: 1be42dc) | patch

author	Sam Hartman <hartmans@debian.org>
	Thu, 20 Sep 2001 06:47:48 +0000 (06:47 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Thu, 20 Sep 2001 06:47:48 +0000 (06:47 +0000)
commit	50e232acee3251e66cc4b3cf0d618f8d24e70d1a
tree	e451bdc25c6301ab110b946aef5fb7a9bb91b33d	tree \| snapshot
parent	1be42dc7ad7ee533d1bc42d74517223c423b06de	commit \| diff

Merge conflicts

13 files changed:

Makefile.in		diff \| blob \| history
src/afs/LINUX/osi_vnodeops.c		diff \| blob \| history
src/afsd/afs.ppc_darwin.plist.in	[deleted file]	blob \| history
src/afsd/afs.ppc_darwin_12.plist	[deleted file]	blob \| history
src/afsd/afs.ppc_darwin_13.plist	[deleted file]	blob \| history
src/afsd/afs.rc.darwin.plist	[new file with mode: 0644]	blob
src/config/Makefile.ppc_linux22.in		diff \| blob \| history
src/libafs/MakefileProto.LINUX.in		diff \| blob \| history
src/lwp/preempt.c		diff \| blob \| history
src/ptserver/pt_util.c		diff \| blob \| history
src/ptserver/ptserver.c		diff \| blob \| history
src/viced/afsfileprocs.c		diff \| blob \| history
src/vol/partition.c		diff \| blob \| history