]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Sat, 10 Nov 2001 18:50:22 +0000 (13:50 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 10 Nov 2001 18:50:22 +0000 (13:50 -0500)
into whimsy.udel.edu:/backroom/ntp-dev

bk: 3bed76ee0erb_G3Qxbc-vJK4Uj_Arg

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge