From 588b5109454809429d0d484873ebef1604b64199 Mon Sep 17 00:00:00 2001
From: josh <josh@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 23 Jul 2009 05:44:24 +0000
Subject: [PATCH] Updated the changelog to reflect the merging of the new
 zenmap-filter code into the trunk.

---
 CHANGELOG | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index e00b3cd81..298890b5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
+o [Zenmap] Merged the changes in the zenmap-filter branch to the main zenmap
+  branch.  Pressing Ctrl+L now brings up the filter interface for filtering out
+  uninteresting hosts. Alternatively, the interface is accessible via the
+  'Filter Hosts' button.  [Josh]
 
 o [Ncat]In verbose mode Ncat prints In and OUT traffic in bytes once the client connection
   is terminated,in this way "Finished. 29 bytes sent, 24 bytes received."