]> 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: c8c62a2 1949585)
Merge branch 'upstream' into feature/multiple-local-realms
authorRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:38:58 +0000 (10:38 -0800)
committerRuss Allbery <rra@debian.org>
Thu, 12 Feb 2009 18:38:58 +0000 (10:38 -0800)
1  2 
src/config/afs_sysnames.h patch | diff1 | diff2 | blob | history
src/viced/host.c patch | diff1 | diff2 | blob | history
src/viced/viced.c patch | diff1 | diff2 | blob | history

diff --cc src/config/afs_sysnames.h
Simple merge
diff --cc src/viced/host.c
Simple merge
diff --cc src/viced/viced.c
Simple merge