]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 27 May 2006 05:21:38 +0000 (01:21 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 27 May 2006 05:21:38 +0000 (01:21 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 4477e1e2ZgddiCoQrlXdAkL4pj_NBg

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge