From: Dave Hart <hart@ntp.org>
Date: Wed, 30 Dec 2009 05:59:17 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-620
X-Git-Tag: NTP_4_2_7P7~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f954c77b0005b9bbeb509a619ee6375aeb19051;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-620
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-620-1446

bk: 4b3aec35sMY3uU76juLFNxsgJsuTsw
---

4f954c77b0005b9bbeb509a619ee6375aeb19051
diff --cc ChangeLog
index 2e54c8637,ca975f307..3a6cab565
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,4 +1,5 @@@
 +* [Bug 620] ntpdc getresponse() esize != *rsize s/b size != *rsize.
+ * [Bug 1446] 4.2.7p6 requires autogen, missing ntpd.1, *.texi, *.menu.
  (4.2.7p6) 2009/12/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1443] Remove unnecessary dependencies on ntp_io.h
  * [Bug 1442] Move Windows functions into libntp files