]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Mon, 15 Aug 2005 05:28:04 +0000 (01:28 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 15 Aug 2005 05:28:04 +0000 (01:28 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-ag+

bk: 430027e4azkbbz5-yMqYwXUloBmP8A

1  2 
include/ntpd.h
ntpd/ntp_config.c

diff --cc include/ntpd.h
Simple merge
Simple merge