]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorFrank Kardel <kardel@ntp.org>
Tue, 23 Aug 2005 05:48:01 +0000 (05:48 +0000)
committerFrank Kardel <kardel@ntp.org>
Tue, 23 Aug 2005 05:48:01 +0000 (05:48 +0000)
into  pogo.udel.edu:/pogo/users/kardel/ntp-dev

bk: 430ab891N6kboyiLKJpU59Cm92-RaQ

1  2 
include/ntp.h
ntpd/ntp_proto.c

diff --cc include/ntp.h
Simple merge
Simple merge