]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Sun, 24 Jan 2010 04:57:38 +0000 (23:57 -0500)
committerDanny Mayer <mayer@ntp.org>
Sun, 24 Jan 2010 04:57:38 +0000 (23:57 -0500)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev-vc6merge

bk: 4b5bd342ktVEf_jDyZvJlzTNK6dbDw

1  2 
ntpd/ntp_config.c
ports/winnt/vc6/ntpd.dsp

Simple merge
Simple merge