]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1470
authorDave Hart <hart@ntp.org>
Tue, 2 Feb 2010 01:31:28 +0000 (01:31 +0000)
committerDave Hart <hart@ntp.org>
Tue, 2 Feb 2010 01:31:28 +0000 (01:31 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1470-71-72

bk: 4b6780703A5TFuN3kvlqemZ07vObpg

1  2 
ntpd/Makefile.am

Simple merge