]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://ntp.bkbits.com/ntp-dev
authorFrank Kardel <kardel@ntp.org>
Thu, 11 May 2006 15:16:43 +0000 (15:16 +0000)
committerFrank Kardel <kardel@ntp.org>
Thu, 11 May 2006 15:16:43 +0000 (15:16 +0000)
into  pogo.udel.edu:/pogo/users/kardel/dynamic-if/ntp-dev

bk: 4463555bBT8HMKH31kTWOtaIIm-mdA

1  2 
include/Makefile.am
ntpd/ntp_crypto.c
ntpd/refclock_parse.c

Simple merge
Simple merge
Simple merge