git.michaelhowe.org Git - packages/o/openafs.git/commit

]> git.michaelhowe.org Git - packages/o/openafs.git/commit

projects / packages / o / openafs.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0ed0957 a38e907)

author	Russ Allbery <rra@debian.org>
	Mon, 8 Mar 2010 22:52:43 +0000 (14:52 -0800)
committer	Russ Allbery <rra@debian.org>
	Mon, 8 Mar 2010 22:52:43 +0000 (14:52 -0800)
commit	0fdb65f19e6728cb577bdba3aa32e2c54d54d517
tree	df95b65b9a0fb53015b0b84025d2de50c928af22	tree \| snapshot
parent	0ed0957047ee85f95b2fae42fcf8705eaa41f400	commit \| diff
parent	a38e907fae581dc41d4e12e4414f5d4fe48bccac	commit \| diff

Merge commit 'upstream/1.4.12.pre4+dfsg'

Conflicts:
configure.in
src/afs/LINUX/osi_file.c
src/cf/linux-test3.m4
src/cf/linux-test4.m4
src/viced/host.c

configure.in	diff1 \|	diff2 \|	blob \| history
src/bozo/bosoprocs.c	diff1 \|	diff2 \|	blob \| history
src/cf/osconf.m4	diff1 \|	diff2 \|	blob \| history
src/shlibafsauthent/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/shlibafsrpc/Makefile.in	diff1 \|	diff2 \|	blob \| history
src/venus/fstrace.c	diff1 \|	diff2 \|	blob \| history