From 01e4c2369250d01ad85e990e2e8072d4f5ecf8ab Mon Sep 17 00:00:00 2001
From: david <david@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Tue, 22 Jan 2013 00:07:16 +0000
Subject: [PATCH] CHANGELOG a side effect of target refactoring: mixed IPv4
 ranges and netmasks.

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

diff --git a/CHANGELOG b/CHANGELOG
index 5a1b56070..49405d660 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,9 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o It's now possible to mix IPv4 range notation with CIDR netmasks in
+  target specifications. For example, 192.168-170.4-100,200.5/16 is
+  effectively the same as 192.168.168-170.0-255.0-255. [David Fifield]
+
 o Added nmap-fo.xsl, contributed by Tilik Ammon. This converts Nmap
   XML into XSL-FO, which can be converted into PDF using Apache FOP.