]> git.michaelhowe.org Git - packages/o/openafs.git/commit
projects / packages / o / openafs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3a5a655) | patch
Merge conflicts between 1.2.9 and 1.2.10
authorSam Hartman <hartmans@debian.org>
Wed, 30 Jul 2003 17:23:46 +0000 (17:23 +0000)
committerSam Hartman <hartmans@debian.org>
Wed, 30 Jul 2003 17:23:46 +0000 (17:23 +0000)
commit75094553b1e2a5ff6c8a4dcec94de9ccd0015eb2
tree5a98cb48d8fb0cda881a4a9b573a80ee47c78610tree | snapshot
parent3a5a6558b74cfd938f3069700ba210e8f01b616fcommit | diff
Merge conflicts between 1.2.9 and 1.2.10
37 files changed:
Makefile.in diff | blob | history
NEWS diff | blob | history
acinclude.m4 diff | blob | history
src/afs/LINUX/osi_file.c diff | blob | history
src/afs/LINUX/osi_misc.c diff | blob | history
src/afs/LINUX/osi_module.c diff | blob | history
src/afs/Makefile.in diff | blob | history
src/afs/VNOPS/afs_vnop_readdir.c diff | blob | history
src/afs/afs_call.c diff | blob | history
src/afs/afs_pioctl.c diff | blob | history
src/audit/Makefile.in diff | blob | history
src/auth/Makefile.in diff | blob | history
src/comerr/Makefile.in diff | blob | history
src/config/Makefile.i386_linux22.in diff | blob | history
src/config/param.i386_linux24.h diff | blob | history
src/des/Makefile.in diff | blob | history
src/kauth/Makefile.in diff | blob | history
src/libafs/Makefile.common diff | blob | history
src/libafs/MakefileProto.LINUX.in diff | blob | history
src/lwp/Makefile.in diff | blob | history
src/lwp/lwp.h diff | blob | history
src/lwp/process.c diff | blob | history
src/pam/Makefile.in diff | blob | history
src/pinstall/install.c diff | blob | history
src/ptserver/ptserver.c diff | blob | history
src/rx/Makefile.in diff | blob | history
src/rx/rx.c diff | blob | history
src/rx/rx_kcommon.h diff | blob | history
src/rx/rx_packet.c diff | blob | history
src/rxkad/Makefile.in diff | blob | history
src/sys/Makefile.in diff | blob | history
src/uss/uss_procs.c diff | blob | history
src/uss/uss_vol.c diff | blob | history
src/venus/Makefile.in diff | blob | history
src/venus/fs.c diff | blob | history
src/venus/kdump.c diff | blob | history
src/vlserver/cnvldb.c diff | blob | history