]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 14 Jun 2006 18:22:40 +0000 (14:22 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 14 Jun 2006 18:22:40 +0000 (14:22 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-dyn-if

bk: 449053f019FnKA9ZUMgnw35_1LVZOA

1  2 
configure.ac
ntpd/ntpdbase-opts.def

diff --cc configure.ac
Simple merge
Simple merge