]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 5 Jan 2002 05:01:18 +0000 (00:01 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 5 Jan 2002 05:01:18 +0000 (00:01 -0500)
into whimsy.udel.edu:/backroom/ntp-dev-ipv6

bk: 3c36889eTorvJG_wVGRBEZJVDPCOtg

1  2 
ntpd/ntp_control.c

Simple merge