]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Thu, 16 Sep 2004 20:20:19 +0000 (16:20 -0400)
committerDanny Mayer <mayer@ntp.org>
Thu, 16 Sep 2004 20:20:19 +0000 (16:20 -0400)
into pogo.udel.edu:/pogo/users/mayer/ntp-dev-io

bk: 4149f583vIUO0GCG5_gJl_-4hdRfmg

1  2 
include/ntp.h
ntpd/ntp_io.c

diff --cc include/ntp.h
Simple merge
diff --cc ntpd/ntp_io.c
Simple merge