]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://www.ntp.org/ntp-dev
authorDanny Mayer <mayer@ntp.org>
Tue, 15 Aug 2006 17:29:49 +0000 (13:29 -0400)
committerDanny Mayer <mayer@ntp.org>
Tue, 15 Aug 2006 17:29:49 +0000 (13:29 -0400)
into  pogo.udel.edu:/pogo/users/mayer/ntp-dev

bk: 44e2048dEIDfLEZBlxeqzNrk2QY7RA

1  2 
ntpd/ntpdbase-opts.def
ports/winnt/ntpd/ntservice.c

Simple merge
Simple merge