]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 6 Mar 2003 02:04:21 +0000 (21:04 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 6 Mar 2003 02:04:21 +0000 (21:04 -0500)
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3e66aca54_pj6OPdwGwh1_C9NDpVRQ

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge