From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 2 Feb 2014 08:10:57 +0000 (-0500)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P417~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e182b77958cb797f9c0fd6b03bf69ac027f95956;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/murray/bug-2539

bk: 52edfd91lNDXyvzArKtYoSmn7loqTA
---

e182b77958cb797f9c0fd6b03bf69ac027f95956
diff --cc ChangeLog
index eebbacdaf,52c86e93e..e5006284d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,7 +1,10 @@@
 +* Bug 2539: doc and code tweaks for NMEA driver
 +* Add check for enable stats to ntpd/complete.conf.in
 +* Fix typo in html/confopt.html
+ (4.2.7p416) 2014/01/31 Released by Harlan Stenn <stenn@ntp.org>
+ * Tweak the 'Modified' line on appropriate html pages.
+ * Note in the deprecation of ntpdc in its documentation.
+ * [Bug 2332] Be more careful about when we use 'libgcc_s'.
  (4.2.7p415) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>
  * Fix the man page installation for the scripts/ files.
  (4.2.7p414) 2014/01/28 Released by Harlan Stenn <stenn@ntp.org>