]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 10 Jul 2006 06:47:58 +0000 (02:47 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 10 Jul 2006 06:47:58 +0000 (02:47 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44b1f81euV-5PmRr0MGuh9OFJiFU-A

1  2 
NEWS
sntp/configure.ac

diff --cc NEWS
index a96d33aa5087ef60b97f587b7b9173b946612d3a,5a656b2b97624919d38e9d3551e8712a5b025f6a..e24870c428ef039eef7c1f76aec7d24331b59a35
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,5 +1,8 @@@
 +* Dynamic interface scanning can now be done [Bug 637, 51?]
 +* Options processing now uses GNU AutoGen
 +\f
  (4.2.2)
+ * Get sntp working under AIX-5
  * Resolve an ambiguity in the copyright notice
  -
  * SNTP
Simple merge