]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy:/backroom/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 17 Aug 2007 09:50:28 +0000 (05:50 -0400)
committerHarlan Stenn <stenn@ntp.org>
Fri, 17 Aug 2007 09:50:28 +0000 (05:50 -0400)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev

bk: 46c56f64iSZJ3faG_D8MdVtkn8UP-Q

1  2 
ntpd/ntp_config.c

Simple merge