]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Wed, 1 Mar 2006 06:34:16 +0000 (01:34 -0500)
committerHarlan Stenn <stenn@ntp.org>
Wed, 1 Mar 2006 06:34:16 +0000 (01:34 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag

bk: 44054068D6ePLwjjk37XzMIKOm63FQ

1  2 
ntpdc/ntpdc.c
ntpq/ntpq.c

diff --cc ntpdc/ntpdc.c
Simple merge
diff --cc ntpq/ntpq.c
Simple merge