From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Oct 2010 03:30:30 +0000 (-0400)
Subject: Merge bk://bk2.ntp.org./ntp-stable
X-Git-Tag: NTP_4_2_7P62~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b04cb02ddbff39f8d830eef8cf24b93f9ea3bf2b;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-stable
into  psp-deb1.ntp.org:/home/hart/ntp-stable-1567-1659

bk: 4cb3d656GbkwX2X9aO2nosWYawNTsA
---

b04cb02ddbff39f8d830eef8cf24b93f9ea3bf2b
diff --cc ChangeLog
index b86ad1e58,ca6c30881..64ef08d1e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,9 +1,11 @@@
  ---
  
+ * [Bug 1567] Support Arbiter 1093C Satellite Clock on Windows.
 -* [Bug 1643] Range-check the decoding of the RIPE-NCC status codes.
 -* [Bug 1644] cvo.sh should use lsb_release to identify linux distros.
 +* [Bug 1643]: Range-check the decoding of the RIPE-NCC status codes.
 +* [Bug 1644]: cvo.sh should use lsb_release to identify linux distros.
+ * [Bug 1659] Support Truetime Satellite Clocks on Windows.
 +* [Bug 1660]: On some systems, test is in /usr/bin, not /bin.
 +* [Bug 1661]: Re-indent refclock_ripencc.c.
  
  ---
  (4.2.6p3-RC2) 2010/09/25 Released by Harlan Stenn <stenn@ntp.org>