]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Thu, 1 Nov 2001 06:25:02 +0000 (01:25 -0500)
committerHarlan Stenn <stenn@ntp.org>
Thu, 1 Nov 2001 06:25:02 +0000 (01:25 -0500)
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3be0eabe1XF7FRVTMoc_omPhjAVJ7Q

1  2 
Makefile.am
ntpd/ntpd.c

diff --cc Makefile.am
Simple merge
diff --cc ntpd/ntpd.c
Simple merge