]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-ag5.11.2
authorDave Hart <hart@ntp.org>
Thu, 18 Nov 2010 05:11:56 +0000 (05:11 +0000)
committerDave Hart <hart@ntp.org>
Thu, 18 Nov 2010 05:11:56 +0000 (05:11 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-ag5.11.2

bk: 4ce4b59cnjNh69bXbgTPuOy5M76tpg

1  2 
ports/winnt/vc6/ntpd.dsp

Simple merge