]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 30 Nov 2005 11:08:00 +0000 (11:08 +0000)
committerHarlan Stenn <stenn@ntp.org>
Wed, 30 Nov 2005 11:08:00 +0000 (11:08 +0000)
into  ntp1.isc.org:/hog0/users/stenn/ntp-dev

bk: 438d8810szfStVaBhHyvQMszgIPrwQ

1  2 
ntpd/ntp_config.c

Simple merge