From: Dave Hart <hart@ntp.org>
Date: Sat, 18 Apr 2009 04:53:17 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9beb50d583374ee848ccf6e2cc3b830ed7bd15ef;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1159
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-3-7-8-9

bk: 49e95cbdEcOmd3dnvNTzWNMTNbhLIg
---

9beb50d583374ee848ccf6e2cc3b830ed7bd15ef
diff --cc ChangeLog
index 5fb51d4508,3aaab36daf..81cbe793f1
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 +* [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.