merge from 2_0_merge1 to 2_0_merge2

1 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index da6bcdf..8134ae7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,16 @@
-2004-11-10  Miklos Szeredi <miklos@szeredi.hu>
+2004-11-11  Miklos Szeredi <miklos@szeredi.hu>
 
-	* Merge from fuse_2_0_bugfix to fuse_2_0_merge1
+	* Check kernel interface version in fusermount to prevent
+	strangeness in case of mismatch.
 
 2004-11-10  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Separate configure for the kernel directory
 
+	* Don't allow write to return more than 'count'
+
+	* Extend kernel interface for future use
+
 2004-11-09  Miklos Szeredi <miklos@szeredi.hu>
 
 	* Fix 'makeconf.sh' to use autoreconf if available