]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Wed, 26 Jul 2006 07:55:45 +0000 (03:55 -0400)
committerHarlan Stenn <stenn@ntp.org>
Wed, 26 Jul 2006 07:55:45 +0000 (03:55 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 44c72001H7BlrDLbz43Pkkew6vOpkg

1  2 
ntpq/ntpq.c

diff --cc ntpq/ntpq.c
Simple merge