]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 5 May 2007 18:16:21 +0000 (14:16 -0400)
committerHarlan Stenn <stenn@ntp.org>
Sat, 5 May 2007 18:16:21 +0000 (14:16 -0400)
into  pogo.udel.edu:/pogo/users/kamboj/new-config-bk-repo

bk: 463cc9f5nhV-P0IfKCp_mZnnfybiJA

1  2 
configure.ac
ntpd/ntpd.c

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