From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 9 Feb 2010 08:07:43 +0000 (-0500)
Subject: Merge bk://maccarony/ntp-stable
X-Git-Tag: NTP_4_2_6P1_RC5~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e05db41328855fe5e6eb8e51b9f8b7a13f82f3;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-stable
into  pogo.udel.edu:/pogo/users/hart/ntp-stable-1478-79-84

bk: 4b7117cfT7Ro1M0g8zke7Oby4A7Nlg
---

11e05db41328855fe5e6eb8e51b9f8b7a13f82f3
diff --cc ChangeLog
index 099e24a16,2c1a58f79..e9ff50aaf
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,10 -1,8 +1,11 @@@
  ---
  
+ * [Bug 1140] Clean up debug.html, decode.html, and ntpq.html.
  * [Bug 1477] 1st non-gmake make in clone w/VPATH can't make COPYRIGHT.
 +* [Bug 1478] linking fails with undefined reference EVP_MD_pkey_type.
 +* [Bug 1479] Compilation fails because of not finding readline headers.
  * [Bug 1480] snprintf() cleanup caused unterminated refclock IDs.
 +* [Bug 1484] ushort is not defined in QNX6.
  
  ---
  (4.2.6p1-RC4) 2010/02/04 Released by Harlan Stenn <stenn@ntp.org>