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

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

projects / packages / o / openafs.git / commit

author	Sam Hartman <hartmans@debian.org>
	Tue, 11 Sep 2001 15:48:59 +0000 (15:48 +0000)
committer	Sam Hartman <hartmans@debian.org>
	Tue, 11 Sep 2001 15:48:59 +0000 (15:48 +0000)
commit	e292d01cd8e8c61577f76978733a3f10ae031acb
tree	dc3ccb76bdf3597aa4df47f1f9c800a065dbe264	tree \| snapshot
parent	1830d4d54020beb3b142f9308e0af0526de2c4d6	commit \| diff

Merge conflicts

143 files changed:

Makefile.in		diff \| blob \| history
aclocal.m4	[deleted file]	blob \| history
configure	[deleted file]	blob \| history
src/WINNT/install/InstallShield5/Default.rge	[deleted file]	blob \| history
src/WINNT/install/InstallShield5/lang/en_US/value.shl	[deleted file]	blob \| history
src/afs/LINUX/osi_file.c		diff \| blob \| history
src/afs/LINUX/osi_machdep.h		diff \| blob \| history
src/afs/LINUX/osi_misc.c		diff \| blob \| history
src/afs/LINUX/osi_module.c		diff \| blob \| history
src/afs/LINUX/osi_vnodeops.c		diff \| blob \| history
src/afs/Makefile	[deleted file]	blob \| history
src/afs/VNOPS/afs_vnop_lookup.c		diff \| blob \| history
src/afs/afs.h		diff \| blob \| history
src/afs/afs_call.c		diff \| blob \| history
src/afs/afs_daemons.c		diff \| blob \| history
src/afs/afs_pioctl.c		diff \| blob \| history
src/afsd/Makefile	[deleted file]	blob \| history
src/afsd/afs.rc.darwin.plist	[deleted file]	blob \| history
src/afsmonitor/Makefile	[deleted file]	blob \| history
src/afsweb/Makefile	[deleted file]	blob \| history
src/audit/Makefile	[deleted file]	blob \| history
src/auth/Makefile	[deleted file]	blob \| history
src/auth/test/Makefile	[deleted file]	blob \| history
src/bozo/Makefile	[deleted file]	blob \| history
src/bozo/test/Makefile	[deleted file]	blob \| history
src/bu_utils/Makefile	[deleted file]	blob \| history
src/bubasics/Makefile	[deleted file]	blob \| history
src/bucoord/Makefile	[deleted file]	blob \| history
src/budb/Makefile	[deleted file]	blob \| history
src/butc/Makefile	[deleted file]	blob \| history
src/butm/Makefile	[deleted file]	blob \| history
src/cmd/Makefile	[deleted file]	blob \| history
src/cmd/test/Makefile	[deleted file]	blob \| history
src/comerr/Makefile	[deleted file]	blob \| history
src/comerr/test/Makefile	[deleted file]	blob \| history
src/config/Makefile	[deleted file]	blob \| history
src/config/Makefile.i386_linux22.in		diff \| blob \| history
src/config/Makefile.ppc_linux22.in		diff \| blob \| history
src/config/Makefile.version	[deleted file]	blob \| history
src/config/afsconfig.h.in	[deleted file]	blob \| history
src/dauth/Makefile	[deleted file]	blob \| history
src/des/Makefile	[deleted file]	blob \| history
src/des/test/Makefile	[deleted file]	blob \| history
src/des_stub/Makefile	[deleted file]	blob \| history
src/dir/Makefile	[deleted file]	blob \| history
src/dir/test/Makefile	[deleted file]	blob \| history
src/export/Makefile	[deleted file]	blob \| history
src/finale/Makefile	[deleted file]	blob \| history
src/fsint/Makefile	[deleted file]	blob \| history
src/fsprobe/Makefile	[deleted file]	blob \| history
src/ftpd43+/Makefile	[deleted file]	blob \| history
src/gtx/Makefile	[deleted file]	blob \| history
src/inetd/Makefile	[deleted file]	blob \| history
src/kauth/Makefile	[deleted file]	blob \| history
src/kauth/test/Makefile	[deleted file]	blob \| history
src/libacl/Makefile	[deleted file]	blob \| history
src/libacl/test/Makefile	[deleted file]	blob \| history
src/libadmin/Makefile	[deleted file]	blob \| history
src/libadmin/adminutil/Makefile	[deleted file]	blob \| history
src/libadmin/bos/Makefile	[deleted file]	blob \| history
src/libadmin/cfg/Makefile	[deleted file]	blob \| history
src/libadmin/cfg/test/Makefile	[deleted file]	blob \| history
src/libadmin/client/Makefile	[deleted file]	blob \| history
src/libadmin/kas/Makefile	[deleted file]	blob \| history
src/libadmin/pts/Makefile	[deleted file]	blob \| history
src/libadmin/samples/Makefile	[deleted file]	blob \| history
src/libadmin/test/Makefile	[deleted file]	blob \| history
src/libadmin/vos/Makefile	[deleted file]	blob \| history
src/libafs/Makefile.common		diff \| blob \| history
src/libafs/MakefileProto.LINUX.in		diff \| blob \| history
src/libafsauthent/Makefile	[deleted file]	blob \| history
src/libafsrpc/Makefile	[deleted file]	blob \| history
src/libuafs/MakefileProto.AIX	[deleted file]	blob \| history
src/libuafs/MakefileProto.DARWIN	[deleted file]	blob \| history
src/libuafs/MakefileProto.DUX	[deleted file]	blob \| history
src/libuafs/MakefileProto.FBSD	[deleted file]	blob \| history
src/libuafs/MakefileProto.HPUX	[deleted file]	blob \| history
src/libuafs/MakefileProto.IRIX	[deleted file]	blob \| history
src/libuafs/MakefileProto.LINUX	[deleted file]	blob \| history
src/libuafs/MakefileProto.SOLARIS	[deleted file]	blob \| history
src/log/Makefile	[deleted file]	blob \| history
src/log/test/Makefile	[deleted file]	blob \| history
src/login/Makefile	[deleted file]	blob \| history
src/lwp/Makefile	[deleted file]	blob \| history
src/lwp/lwp.c		diff \| blob \| history
src/lwp/lwp.h		diff \| blob \| history
src/lwp/preempt.c		diff \| blob \| history
src/lwp/process.c		diff \| blob \| history
src/lwp/test/Makefile	[deleted file]	blob \| history
src/mpp/Makefile	[deleted file]	blob \| history
src/ntp/Makefile	[deleted file]	blob \| history
src/null/Makefile	[deleted file]	blob \| history
src/package/Makefile	[deleted file]	blob \| history
src/pinstall/Makefile	[deleted file]	blob \| history
src/pinstall/test/Makefile	[deleted file]	blob \| history
src/procmgmt/Makefile	[deleted file]	blob \| history
src/procmgmt/test/Makefile	[deleted file]	blob \| history
src/ptserver/Makefile	[deleted file]	blob \| history
src/ptserver/ptserver.c		diff \| blob \| history
src/rcp/Makefile	[deleted file]	blob \| history
src/rlogind/Makefile	[deleted file]	blob \| history
src/rsh/Makefile	[deleted file]	blob \| history
src/rx/Makefile	[deleted file]	blob \| history
src/rx/bulk.example/Makefile	[deleted file]	blob \| history
src/rx/bulktest/Makefile	[deleted file]	blob \| history
src/rx/multi.example/Makefile	[deleted file]	blob \| history
src/rx/rx.c		diff \| blob \| history
src/rx/rx_packet.c		diff \| blob \| history
src/rx/simple.example/Makefile	[deleted file]	blob \| history
src/rx/test/Makefile	[deleted file]	blob \| history
src/rxgen/Makefile	[deleted file]	blob \| history
src/rxkad/Makefile	[deleted file]	blob \| history
src/rxkad/test/Makefile	[deleted file]	blob \| history
src/rxstat/Makefile	[deleted file]	blob \| history
src/scout/Makefile	[deleted file]	blob \| history
src/sgistuff/Makefile	[deleted file]	blob \| history
src/sia/Makefile	[deleted file]	blob \| history
src/sys/Makefile	[deleted file]	blob \| history
src/tbutc/Makefile	[deleted file]	blob \| history
src/tsm41/Makefile	[deleted file]	blob \| history
src/tviced/Makefile	[deleted file]	blob \| history
src/ubik/Makefile	[deleted file]	blob \| history
src/update/Makefile	[deleted file]	blob \| history
src/usd/Makefile	[deleted file]	blob \| history
src/usd/test/Makefile	[deleted file]	blob \| history
src/uss/Makefile	[deleted file]	blob \| history
src/util/Makefile	[deleted file]	blob \| history
src/util/dirpath.c		diff \| blob \| history
src/util/dirpath.h	[deleted file]	blob \| history
src/util/test/Makefile	[deleted file]	blob \| history
src/venus/Makefile	[deleted file]	blob \| history
src/venus/fstrace.c		diff \| blob \| history
src/venus/test/Makefile	[deleted file]	blob \| history
src/vfsck/Makefile	[deleted file]	blob \| history
src/viced/Makefile	[deleted file]	blob \| history
src/viced/afsfileprocs.c		diff \| blob \| history
src/vlserver/Makefile	[deleted file]	blob \| history
src/vol/Makefile	[deleted file]	blob \| history
src/vol/test/Makefile	[deleted file]	blob \| history
src/volser/Makefile	[deleted file]	blob \| history
src/volser/volmain.c		diff \| blob \| history
src/wsadmin.src/Makefile	[deleted file]	blob \| history
src/xstat/Makefile	[deleted file]	blob \| history

RSS Atom