From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 1 Jul 2009 06:42:13 +0000 (-0400)
Subject: Merge bk://maccarony.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bcb44d02b282fc0e98aa1b5f51c35af45921bc6;p=thirdparty%2Fntp.git

Merge bk://maccarony.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-1234

bk: 4a4b0545pA0ipyaxQrpeo1ezDUnRBw
---

9bcb44d02b282fc0e98aa1b5f51c35af45921bc6
diff --cc ChangeLog
index 750580c9d5,148319f4c8..dffbac5463
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,6 +1,9 @@@
+ * [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
 +* Bug[1236] Declaration order fixed.
 +* Bracket private ONCORE debug statements with #if 0 rather than #ifdef DEBUG
 +* Delete ONCORE debug statement that is now handled elsewhere.
  (4.2.5p184) 2009/06/24 Released by Harlan Stenn <stenn@ntp.org>
  * [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>