]> 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: be05a12 ab59d95)
Merge commit 'upstream/1.5.73.3' into experimental
authorRuss Allbery <rra@debian.org>
Tue, 6 Apr 2010 21:40:01 +0000 (14:40 -0700)
committerRuss Allbery <rra@debian.org>
Tue, 6 Apr 2010 21:40:01 +0000 (14:40 -0700)
Conflicts:
src/tviced/Makefile.in

1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge