]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorFrank Kardel <kardel@ntp.org>
Tue, 6 Jun 2006 07:35:41 +0000 (07:35 +0000)
committerFrank Kardel <kardel@ntp.org>
Tue, 6 Jun 2006 07:35:41 +0000 (07:35 +0000)
into  pogo.udel.edu:/pogo/users/kardel/dynamic-if/ntp-dev

bk: 4485304dkW-XC1ChWxyVrr2Tqq0X3w

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge