From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 29 Dec 2014 09:23:38 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P1_BETA3~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c2f579edfb4ed27df26b3f76fe313c321796959f;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable

bk: 54a11d9a1Ivn2dTJ78Wbvu0A8As6mQ
---

c2f579edfb4ed27df26b3f76fe313c321796959f
diff --cc ChangeLog
index e64650d48,85dd70865..f399e7247
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,12 @@@
  ---
+ 
 -* [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
+ * [Bug 2695] 4.2.8 does not build on Windows.
++---
 +(4.2.8p1-beta2) 2014/12/27 Released by Harlan Stenn <stenn@ntp.org>
 +
 +* [Bug 2674] Install sntp in sbin on NetBSD.
 +* [Bug 2693] ntp-keygen doesn't build without OpenSSL and sntp.
 +* [Bug 2707] Avoid a C90 extension in libjsmn/jsmn.c.
  * [Bug 2709] see if we have a C99 compiler (not yet required).
  ---
  (4.2.8p1-beta1) 2014/12/23 Released by Harlan Stenn <stenn@ntp.org>