]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://ntp.bkbits.net/ntp-dev
authorFrank Kardel <kardel@ntp.org>
Sun, 18 Jun 2006 22:12:27 +0000 (22:12 +0000)
committerFrank Kardel <kardel@ntp.org>
Sun, 18 Jun 2006 22:12:27 +0000 (22:12 +0000)
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 4495cfcbIJ_Cm5GoK4G64l6AbNj49A

1  2 
ntpd/ntp_io.c

diff --cc ntpd/ntp_io.c
Simple merge