]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Tue, 4 Oct 2005 05:47:59 +0000 (01:47 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 4 Oct 2005 05:47:59 +0000 (01:47 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 4342178fUbeAmwpzNxyn1KfppQhbGA

1  2 
ntpd/ntp_config.c

Simple merge