merge from merge4 to merge5
authorMiklos Szeredi <miklos@szeredi.hu>
Wed, 1 Dec 2004 18:56:39 +0000 (18:56 +0000)
committerMiklos Szeredi <miklos@szeredi.hu>
Wed, 1 Dec 2004 18:56:39 +0000 (18:56 +0000)
commitb9b94cdd0a05ff3cba661fda58279e4bdc74db5c
tree79461f2a8fe5ea8aeb83cf312b542919d69e67e1
parent039322d8f1295bf20057303882bf1202a03d125e
merge from merge4 to merge5
12 files changed:
ChangeLog
configure.in
include/Makefile.am
include/linux/.cvsignore [deleted file]
include/linux/Makefile.am [deleted file]
kernel/Makefile.in
kernel/fuse_i.h
kernel/fuse_kernel.h [new file with mode: 0644]
kernel/linux/fuse.h [deleted file]
lib/fuse.c
makeconf.sh
util/fusermount.c