From 0146fd03a67aea4a1c246da03a2629a5f47030fe Mon Sep 17 00:00:00 2001
From: pdw <>
Date: Sat, 27 Nov 2010 11:39:32 +0000
Subject: [PATCH] Updated changelog and pre-release notice.

---
 ChangeLog    | 17 +++++++++++++++++
 configure.in |  9 ++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e24cbc3..e51722d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,19 +7,36 @@ Unattributed items are by Paul Warren and Chris Lightfoot.
 0.18
 * Various typos in the UI
     Gerben Roest <g.roest@grepit.nl>
+
 * Documentation fixes
     A. Costa <agcosta@gis.net> (via Debian)
+
 * Fix for armeb specific bug
     Lennert Buytenhek <buytenh+debian@wantstofly.org> (via Debian)
+
 * Fix frozen order drives line totals crazy.
     Max Alekseyev <relf@os2.ru> (via Debian)
+
 * Fix for crash on arm.
     Joey Hess <joeyh@debian.org> (via Debian)
+
 * Fixed behaviour of "-b" option.
     Eric Cooper <ecc@cmu.edu> (via Debian)
+
 * Support for PFLOG Interfaces
     Richard Tóth <risko@iklub.sk>
 
+* Support for IPv6
+* Fix for performance issue with address hashing
+* Fix for failing link address detection for GNU/kfreebsd
+    Mats Erik Andersson <mats.andersson@gisladisker.se>
+
+* Improved behaviour of sort in sent/recv only mode
+    Damián Viano <des@debian.org>
+
+* Fixed segfault / hang when supplying multiple -i options
+
+
 0.17 12/02/06
 * Display top scale in bytes when measuring in bytes
     Marcin Kryczek <mkay@gentoo.org>
diff --git a/configure.in b/configure.in
index ec0416d..2aee6e3 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ AC_CONFIG_AUX_DIR(config)
 AC_CANONICAL_SYSTEM
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(iftop, "0.17")
+AM_INIT_AUTOMAKE(iftop, "1.0pre1")
 
 AC_DEFINE_UNQUOTED(IFTOP_VERSION, "$VERSION", [The iftop version number])
 
@@ -452,10 +452,9 @@ This is a pre-release version.  Pre-releases are subject to limited
 announcements, and therefore limited circulation, as a means of testing
 the more widely circulated final releases.  
 
-Please do not be surprised if this release is utterly, utterly broken.  If you
-do find this release to be utterly, utterly broken, do not assume that someone
-else has spotted it.  Instead, please drop a note on the mailing list,
-or a brief email to me on pdw@ex-parrot.com
+Please do not be surprised if this release is broken, and if it is broken, do
+not assume that someone else has spotted it.  Instead, please drop a note on
+the mailing list, or a brief email to me on pdw@ex-parrot.com
 
 Thank you for taking the time to be the testing phase of this development
 process.