]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/home/bk/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Sun, 27 Mar 2005 21:49:08 +0000 (16:49 -0500)
committerDanny Mayer <mayer@ntp.org>
Sun, 27 Mar 2005 21:49:08 +0000 (16:49 -0500)
into pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 42472a54rbWFm0ml_aiPflTO6vOMvg

1  2 
ntpd/ntp_proto.c

Simple merge