]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1159
authorDave Hart <hart@ntp.org>
Sat, 18 Apr 2009 13:51:33 +0000 (13:51 +0000)
committerDave Hart <hart@ntp.org>
Sat, 18 Apr 2009 13:51:33 +0000 (13:51 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-3-7-8-9

bk: 49e9dae5_jZHg_AOujP_7TNmsSWD7A

1  2 
ntpq/ntpq.c

diff --cc ntpq/ntpq.c
Simple merge