]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 15 Aug 2005 08:33:46 +0000 (04:33 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 15 Aug 2005 08:33:46 +0000 (04:33 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 4300536aM6nagUmZpIUmWyvQONaCTQ

1  2 
ntpd/ntpd.c

diff --cc ntpd/ntpd.c
Simple merge