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: a689a34 1949585)

author	Russ Allbery <rra@debian.org>
	Thu, 12 Feb 2009 18:13:34 +0000 (10:13 -0800)
committer	Russ Allbery <rra@debian.org>
	Thu, 12 Feb 2009 18:13:34 +0000 (10:13 -0800)
commit	fcf8c89d9b4c6928b52fffc3754f954288b0283f
tree	47738a280be291959a1b4b31a30a99ca11377c55	tree \| snapshot
parent	a689a34687666a3699f7e32b691cec8896e3cf5e	commit \| diff
parent	1949585d2da4e7406568fd5f1de69e4aab3d9126	commit \| diff

Merge commit 'upstream/1.4.8.dfsg1'

Conflicts:

src/afs/LINUX/osi_module.c
src/cf/linux-test4.m4
src/cf/osconf.m4
src/config/param.alpha_linux_26.h
src/ptserver/pt_util.c

configure.in	diff1 \|	diff2 \|	blob \| history
src/cf/osconf.m4	diff1 \|	diff2 \|	blob \| history
src/config/afs_sysnames.h	diff1 \|	diff2 \|	blob \| history
src/libafs/MakefileProto.LINUX.in	diff1 \|	diff2 \|	blob \| history
src/viced/host.c	diff1 \|	diff2 \|	blob \| history
src/viced/viced.c	diff1 \|	diff2 \|	blob \| history