]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 23 Jan 2006 06:00:55 +0000 (01:00 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 23 Jan 2006 06:00:55 +0000 (01:00 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 43d47117Iphe8uwXjRgGArsA3fo-xw

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge