]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
projects / packages / o / openafs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 867bd2b a75274d)
Merge commit 'upstream/1.4.9.pre2+dfsg1'
authorRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:24:28 +0000 (18:24 -0700)
committerRuss Allbery <rra@debian.org>
Wed, 1 Apr 2009 01:24:28 +0000 (18:24 -0700)
Conflicts:
src/afs/LINUX/osi_groups.c
src/afs/LINUX/osi_vfsops.c
src/afs/LINUX/osi_vnodeops.c
src/audit/audit.c
src/auth/userok.c
src/ptserver/ptprocs.c
src/rx/rx.c
src/ubik/recovery.c
src/ubik/remote.c
src/util/get_krbrlm.c
src/viced/host.c
src/viced/viced.c

1  2 
configure.in patch | diff1 | diff2 | blob | history
src/cf/osconf.m4 patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
diff --cc src/cf/osconf.m4
Simple merge