From 7a7bd784681ecc3f8a9d3fe64013666e79435fbd Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 6 Mar 2013 15:20:51 +0000
Subject: [PATCH] Changelog entry for timespec script-args

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

diff --git a/CHANGELOG b/CHANGELOG
index 71139ac12..992db366f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,11 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Timeout script-args are now standardized to use the timespec that
+  Nmap's command-line arguments take (5s, 5000ms, 1h, etc.). Some
+  scripts that previously took an integer number of milliseconds will
+  now treat that as a number of seconds if not explicitly denoted as
+  ms. [Daniel Miller]
+
 o The list of nameservers on Windows now ignores nameservers from
   inactive interfaces. [David Fifield]