]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Tue, 2 Aug 2005 12:44:02 +0000 (08:44 -0400)
committerDanny Mayer <mayer@ntp.org>
Tue, 2 Aug 2005 12:44:02 +0000 (08:44 -0400)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 42ef6a92WLWsyJAjbYeNY2GJGbOQLw

1  2 
ntpd/ntp_peer.c

diff --cc ntpd/ntp_peer.c
Simple merge