From c66ab9d37ba6833d1516cc5603a17496f224a2f2 Mon Sep 17 00:00:00 2001
From: sean <sean@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sun, 5 Aug 2012 18:31:28 +0000
Subject: [PATCH] Updated changelog

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

diff --git a/CHANGELOG b/CHANGELOG
index f745a187c..e805e9f49 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o [NPING] Nping now prints out an error and exists when the user tries to use
+  the -p flag for a scan option where that is meaningless. [Sean Rivera] 
+
 o [NSE] Added smb-print-text script which prints specified text using SMB 
   shared printer. [Aleksandar Nikolic]