]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Mon, 15 Aug 2005 23:47:32 +0000 (19:47 -0400)
committerDanny Mayer <mayer@ntp.org>
Mon, 15 Aug 2005 23:47:32 +0000 (19:47 -0400)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 43012994Le4YibJQ8w6QaaQC4Y7-Sw

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge