Merge branch 'master' into followname

Conflicts:

	inotail.c

1 files changed, 3 insertions, 1 deletions

diff --git a/changelog b/changelog
index 83696c2..3f0d9f7 100644
--- a/changelog
+++ b/changelog
@@ -3,9 +3,11 @@ inotail 0.6
   * Correctly handle tailing from pipes
   * Do not try to seek on pipes when following (thanks Alexander Sulfrian)
   * Handle file truncation in follow mode
+  * Use sys/inotify.h instead of private copy of the inotify header (patch by
+    Adrian Bunk)
   * Various small fixes
 
-  -- Tobias Klauser <tklauser@distanz.ch> 2008-08-31 21:15
+  -- Tobias Klauser <tklauser@distanz.ch> 2008-09-23 09:46
 
 inotail 0.5