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, 13 Apr 2003 19:32:25 +0000 (19:32 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Sun, 13 Apr 2003 19:32:25 +0000 (19:32 +0000)
commit	ed9991dc0484b6a05f6a803f9a4aad2715fc32be
tree	7465c57902c4665d332618daac4b92886c755e91	tree \| snapshot
parent	495b9221491fe75f7fea8708965921ce4ba2ae07	commit \| diff

Merge conflicts from 1.2.8 to 1.2.9

26 files changed:

Makefile.in		diff \| blob \| history
NEWS		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_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/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/config/param.i386_linux22.h		diff \| blob \| history
src/config/param.i386_linux24.h		diff \| blob \| history
src/config/param.s390_linux24.h		diff \| blob \| history
src/lwp/Makefile.in		diff \| blob \| history
src/pam/Makefile.in		diff \| blob \| history
src/ptserver/pt_util.c		diff \| blob \| history
src/rx/rx.c		diff \| blob \| history
src/rx/rx_packet.c		diff \| blob \| history
src/rxkad/ticket5.c		diff \| blob \| history
src/sys/Makefile.in		diff \| blob \| history
src/sys/rmtsyss.c		diff \| blob \| history
src/util/Makefile.in		diff \| blob \| history
src/venus/fstrace.c		diff \| blob \| history
src/venus/kdump.c		diff \| blob \| history
src/viced/afsfileprocs.c		diff \| blob \| history