From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 28 Dec 2009 04:48:27 +0000 (-0500)
Subject: Merge psp-fb1.ntp.org:/home/mayer/ntp-dev-headers
X-Git-Tag: NTP_4_2_7P6~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=254a83d2485fd775bbdfbf687323e305d0799979;p=thirdparty%2Fntp.git

Merge psp-fb1.ntp.org:/home/mayer/ntp-dev-headers
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4b38389b1EcCrhIy1wzMIFyuLnj34g
---

254a83d2485fd775bbdfbf687323e305d0799979
diff --cc ChangeLog
index c2901bf4f,824f467dc..4676c3c4d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,7 @@@
+ * [Bug 1443] Remove unnecessary dependencies on ntp_io.h
+ * [Bug 1442] Move Windows functions into libntp files
  * Include (4.2.6p1-RC3) - [Bug 1127] Check the return of X590_verify().
 +* Include (4.2.6p1-RC3) - [Bug 1439] .texi gen after binary is linked.
  * Include (4.2.6p1-RC3) - [Bug 1440] Update configure.ac to support kfreebsd.
  (4.2.7p5) 2009/12/25 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.6p1-RC2)