From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 1 Aug 2013 05:16:36 +0000 (-0400)
Subject: Merge bk://bk.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_7P378~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce4817efda91492266b357a0147b5d2d1b065797;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/kardel/current/ntp-dev-2425

bk: 51f9ef34NyFCi4adU7lLtdIbvpL3lg
---

ce4817efda91492266b357a0147b5d2d1b065797
diff --cc ChangeLog
index b3a695ac7,783b03263..47f8f1757
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,5 +1,7 @@@
 +* [Bug 2425] move part of input handler code from ntpd.c to ntp_io.c
- * and fix select() only platforms calling input_handler directly.
++  and fix select()-only platforms calling input_handler directly.
+ * Upgrade to AutoGen-5.18.1pre3
+ * Upgrade to libopts-40.1.15.
  (4.2.7p377) 2013/07/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2397] License/copyright cleanup.
  * [Bug 2439] Fix check of EscapeCommFunction() in ports/winnt/libntp/termios.c.