From: Dave Hart <hart@ntp.org>
Date: Thu, 4 Feb 2010 04:34:40 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P16~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ba2de51361bc223bd9b61fb1d9a51cef98ce23f4;p=thirdparty%2Fntp.git

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

bk: 4b6a4e60tn1wKLiawG-jZoDh7vHC9A
---

ba2de51361bc223bd9b61fb1d9a51cef98ce23f4
diff --cc ChangeLog
index c17c4f547,c5481bcd9..470ba9f2f
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,4 +1,5 @@@
- * Include (4.2.6p1) - [Bug 1474] ntp_keygen LCRYPTO after libntp.a.
- * Include (4.2.6p1) - Remove arlib.
 -* Include (4.2.6p1-RC4) - [Bug 1474] ntp_keygen needs LCRYPTO after libntp.a.
++* Include (4.2.6p1-RC4) - [Bug 1474] ntp_keygen LCRYPTO after libntp.a.
++* Include (4.2.6p1-RC4) - Remove arlib.
  (4.2.7p15) 2010/02/03 Released by Harlan Stenn <stenn@ntp.org>
  * Include (4.2.6p1) - [Bug 1455] ntpd does not try /etc/ntp.audio.
  * Include (4.2.6p1) - Convert many sprintf() calls to snprintf(), also