]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1691
authorDave Hart <hart@ntp.org>
Mon, 1 Nov 2010 00:22:49 +0000 (00:22 +0000)
committerDave Hart <hart@ntp.org>
Mon, 1 Nov 2010 00:22:49 +0000 (00:22 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1691

bk: 4cce0859ux_rs67j2v_ffkss1bKcwA

1  2 
ntpd/refclock_nmea.c

Simple merge