From 7b1746941130c29453ba3fc447ce0254f569d7ba Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Mon, 29 Mar 2010 22:15:47 +0000
Subject: [PATCH] Merge from /nmap-exp/david/zenmap-print. This adds simple
 output printing to Zenmap.

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

diff --git a/CHANGELOG b/CHANGELOG
index 4464108e1..e703574da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,7 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [Zenmap] Added the ability to print Nmap output to a printer. [David]
+
 Nmap 5.30BETA1 [2010-03-29]
 
 o [NSE] Added 37 scripts, bringing the total to 117! They are