]> 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: 594cfd4 acf1d92)
Merge branch 'upstream'
authorRuss Allbery <rra@debian.org>
Fri, 27 Jun 2008 22:43:36 +0000 (15:43 -0700)
committerRuss Allbery <rra@debian.org>
Fri, 27 Jun 2008 22:43:36 +0000 (15:43 -0700)
Conflicts:

openafs/config.guess
openafs/config.sub
openafs/configure
openafs/configure-libafs
openafs/src/libafs/make_kbuild_makefile.pl

1  2 
configure patch | diff1 | diff2 | blob | history
configure-libafs patch | diff1 | diff2 | blob | history

diff --cc configure
index 0fb0ac4cb3652109f1e9af0369654653d100210f,c0707b9e6b5f11b837d8c16f02d99f35ad1073b2..c0707b9e6b5f11b837d8c16f02d99f35ad1073b2
mode 100755,100644..100755
--- 1/configure
--- 2/configure
+++ b/configure
diff --cc configure-libafs
index 16295477c801eea6a0982d28315ed658c4521cc3,66972e31e145eb6078ad74ef9bcd36fb2beb3c3d..66972e31e145eb6078ad74ef9bcd36fb2beb3c3d
mode 100755,100644..100755
--- 1/configure-libafs
--- 2/configure-libafs
+++ b/configure-libafs