]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 24 Jan 2016 10:14:46 +0000 (10:14 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sun, 24 Jan 2016 10:14:46 +0000 (10:14 +0000)
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2994

bk: 56a4a4162FWFyr-5p4tGni3Yy1pPYg

1  2 
ChangeLog
ntpd/ntp_io.c

diff --cc ChangeLog
index 743d7cb8a7a4199b67f6b25cf1248ddb96fb9bb4,7d54433656695c30f06950aa7e3c43ae050938e4..c70fe8fc563cf0a16def01a652b989e8bc667f06
+++ b/ChangeLog
@@@ -1,6 -1,5 +1,7 @@@
  ---
 +
+ * [Bug 2994] Systems with HAVE_SIGNALED_IO fail to compile. perlinger@ntp.org
 +* [Bug 2995] Fixes to compile on Windows
  
  ---
  (4.2.8p6) 2016/01/20 Released by Harlan Stenn <stenn@ntp.org>
diff --cc ntpd/ntp_io.c
Simple merge