]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn@whimsy.udel.edu:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 23 Mar 2002 06:12:33 +0000 (01:12 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 23 Mar 2002 06:12:33 +0000 (01:12 -0500)
into dog.pfcs.com:/a/local/etc/amd.stage/spot/._d/da3s1f/src/Networking/Xntp/ntp-dev

bk: 3c9c1cd1ItrT46ej4Vv2TdAU9k3eOA

1  2 
ntpd/ntp_config.c

Simple merge