From: Dave Hart <hart@ntp.org>
Date: Sat, 14 Nov 2009 02:35:24 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1381
X-Git-Tag: NTP_4_2_5P245_RC~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98a58d4d51f96b5fbdecec7cfcee2bc01a943c3b;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1381
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1343-81

bk: 4afe176cz2xcowaalyqcLdtqowY8NQ
---

98a58d4d51f96b5fbdecec7cfcee2bc01a943c3b
diff --cc ChangeLog
index 79b78a545,c7541023e..320d1a3bd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
 +* [Bug 1343] sntp illegal C does not compile on Solaris 7.
+ * [Bug 1381] Version .deps generated include file dependencies to allow
 -  known dependecy-breaking changes to force .deps to be cleaned, 
++  known dependency-breaking changes to force .deps to be cleaned,
+   triggered by changing the contents of deps-ver and/or sntp/deps-ver.
  (4.2.5p244-RC) 2009/11/12 Released by Harlan Stenn <stenn@ntp.org>
  * keygen.html updates from Dave Mills.
  * [Bug 1003] ntpdc unconfig command doesn't prompt for keyid.