]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Tue, 19 Jun 2007 12:38:38 +0000 (08:38 -0400)
committerDanny Mayer <mayer@ntp.org>
Tue, 19 Jun 2007 12:38:38 +0000 (08:38 -0400)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 4677ce4e0TlUNC4xEJjKsuKsUDs3pA

1  2 
ntpd/ntp_io.c

diff --cc ntpd/ntp_io.c
Simple merge