From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 27 Jun 2006 08:26:42 +0000 (-0400)
Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
X-Git-Tag: NTP_4_2_3P12~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1ea711068c4205b354c5be31b624109263eb5cf;p=thirdparty%2Fntp.git

Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44a0ebc2ofHiluECUNNc4MLaLjAl_Q
---

e1ea711068c4205b354c5be31b624109263eb5cf
diff --cc NEWS
index e5db2af18,6a87f8e2b..a96d33aa5
--- a/NEWS
+++ b/NEWS
@@@ -1,7 -1,6 +1,9 @@@
 +* Dynamic interface scanning can now be done [Bug 637, 51?]
 +* Options processing now uses GNU AutoGen
 +
  (4.2.2)
+ * Resolve an ambiguity in the copyright notice
+ -
  * SNTP
  * Many bugfixes
  * Implements the current "goal state" of NTPv4