]>
git.michaelhowe.org Git - packages/o/openafs.git/commit
Merge commit 'upstream/1.5.50.dfsg1' into experimental
Conflicts:
configure.in
src/afs/LINUX/osi_groups.c
src/afs/LINUX/osi_module.c
src/audit/audit.c
src/auth/auth.p.h
src/auth/userok.c
src/cf/linux-test4.m4
src/cf/osconf.m4
src/config/param.alpha_linux_26.h
src/libafs/MakefileProto.LINUX.in
src/pam/Makefile.in
src/ptserver/pt_util.c
src/ptserver/ptprocs.c
src/tviced/Makefile.in
src/util/Makefile.in
src/util/dirpath.c
src/util/dirpath.hin
src/util/dirpath_nt.h
src/util/get_krbrlm.c
src/viced/host.c
src/viced/viced.c