]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorDave Hart <hart@ntp.org>
Thu, 10 Dec 2009 02:10:42 +0000 (02:10 +0000)
committerDave Hart <hart@ntp.org>
Thu, 10 Dec 2009 02:10:42 +0000 (02:10 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1338

bk: 4b2058a2rt_MY6iIDbeYdLa5cTcoRA

1  2 
ntpq/ntpq-subs.c

Simple merge