]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 20 Jul 2006 00:28:32 +0000 (20:28 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 20 Jul 2006 00:28:32 +0000 (20:28 -0400)
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 44bece30ZY-WYJzP6dEcsf6KLXiY_Q

1  2 
ntpd/ntp_io.c

diff --cc ntpd/ntp_io.c
Simple merge