]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 19 Jul 2006 07:11:46 +0000 (03:11 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 19 Jul 2006 07:11:46 +0000 (03:11 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 44bddb32TTQdIsh36TSAQffac81s2w

1  2 
configure.ac
ntpd/ntp_io.c

diff --cc configure.ac
Simple merge
diff --cc ntpd/ntp_io.c
Simple merge