From: Dave Hart <hart@ntp.org>
Date: Fri, 8 May 2009 11:21:30 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P175~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f4f4e9624ec883a41777a8d3336ffc8e02bf415;p=thirdparty%2Fntp.git

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

bk: 4a0415bacMTYjjtpgNdHZP3W0BA6Rw
---

6f4f4e9624ec883a41777a8d3336ffc8e02bf415
diff --cc ChangeLog
index d37c6cae2,ab7543312..cfacba1b0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,6 @@@
 +* Clean up configure.ac NTP_CACHEVERSION interface, display cache
 +  version when clearing.  Fixes a regression.
+ * Include (4.2.4p7-RC6)
  (4.2.5p172) 2009/05/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1175] Instability in PLL daemon mode.
  * [Bug 1176] refclock_parse.c does not compile without PPSAPI.