From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Feb 2012 01:29:50 +0000 (+0000)
Subject: Merge psp-deb1:/home/perlinger/ntp-dev-2135
X-Git-Tag: NTP_4_2_7P257~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b5e66b10833193f4ac85b9613af180bd5c36c35;p=thirdparty%2Fntp.git

Merge psp-deb1:/home/perlinger/ntp-dev-2135
into  dlh-7551.ad.hartbrothers.com:C:/ntp/ntp-dev-2135

bk: 4f3b0a8evIFUMp206SCjADC9BVPwFA
---

9b5e66b10833193f4ac85b9613af180bd5c36c35
diff --cc ChangeLog
index 146936c98,8c622a1c9..26c8356ab
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,4 +1,7 @@@
 -* [Bug 2135] defer calls to 'io_input' to main thread under Windows
++* [Bug 2135] defer calls to 'io_input' to main thread under Windows.
 +(4.2.7p256) 2012/02/08 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 2131] Set the system variable settimeofday only after clock step.
 +* [Bug 2134] --enable-C99-snprintf does not force rpl_snprintf use.
  (4.2.7p255) 2012/01/29 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 603] Only link with nlist()-related libraries when needed:
    More cleanup.