From: Dave Hart <hart@ntp.org>
Date: Wed, 22 Apr 2009 09:53:18 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P164~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ffd6a9ee6c859cfa4d45a5996c19e371d73780b8;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1125-52-53-57-58-59-60-mayer

bk: 49eee90eCvRAVPl33eqdECwY7mBu-w
---

ffd6a9ee6c859cfa4d45a5996c19e371d73780b8
diff --cc ChangeLog
index ad7c77902,77f9d1181..f2c18f5f9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,5 +1,10 @@@
+ * PPS/PPSAPI cleanup from Dave Mills.
+ * Documentation updates from Dave Mills.
 +* [Bug 1125] C runtime per-thread initialization on Windows
 +* [Bug 1152] temporarily disable refclock_parse, refclock_true until
 +  maintainers can repair build break from pps_sample()
 +* [Bug 1153] refclock_nmea should not mix UTC with GPS time
 +* [Bug 1159] ntpq overlap diagnostic message test buggy
  (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
  (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
  * Documentation updates from Dave Mills.