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

bk: 4661efe8A5oeyssJb1il6GL2hGI0vg

1  2 
ntpd/ntp_io.c

diff --cc ntpd/ntp_io.c
Simple merge