From: Dave Hart <hart@ntp.org>
Date: Fri, 26 Jun 2009 02:30:59 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17b47f5dc7d00f0d4a20a6b8de4e0955071f60a4;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1234

bk: 4a4432e3uGJhZHDiWIfsLGyQa_5iiw
---

17b47f5dc7d00f0d4a20a6b8de4e0955071f60a4
diff --cc ChangeLog
index e5be57d3d5,8fece5a823..3d5ad48f25
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,6 +1,8 @@@
+ * [Bug 1234] convert NMEA driver to use common PPSAPI code
+ * timepps-Solaris.h pps_handle_t changed from pointer to scalar
+ * Spectracom refclock added to Windows port of ntpd
 +(4.2.5p184) 2009/06/24 Released by Harlan Stenn <stenn@ntp.org>
- * [Bg 1233] atom refclock fudge time1 sign flipped in 4.2.4p164.
++* [Bug 1233] atom refclock fudge time1 sign flipped in 4.2.5p164.
  (4.2.5p183) 2009/06/23 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1196] setsockopt(SO_EXCLUSIVEADDRUSE) can fail on Windows 2000
    and earlier with WSAINVAL, do not log a complaint in that case.