]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sun, 4 Feb 2007 22:45:25 +0000 (17:45 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sun, 4 Feb 2007 22:45:25 +0000 (17:45 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45c66205-aeMPlhK6CGzgkJvv6v7sw

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge