]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
authorDave Hart <hart@ntp.org>
Mon, 22 Nov 2010 23:02:08 +0000 (23:02 +0000)
committerDave Hart <hart@ntp.org>
Mon, 22 Nov 2010 23:02:08 +0000 (23:02 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-bs-no-recursive

bk: 4ceaf670dJC77OB6seMlhAqFlmQOVw

1  2 
ntpd/ntp_io.c

diff --cc ntpd/ntp_io.c
Simple merge