]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Fri, 6 Aug 2004 22:51:56 +0000 (18:51 -0400)
committerDanny Mayer <mayer@ntp.org>
Fri, 6 Aug 2004 22:51:56 +0000 (18:51 -0400)
into pogo.udel.edu:/pogo/users/mayer/ntp-dev-io

bk: 41140b8cRf_DvnwpYbnnox1BfMDGcQ

1  2 
ntpd/ntp_control.c

Simple merge