]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 29 Jan 2007 23:42:58 +0000 (18:42 -0500)
committerHarlan Stenn <stenn@ntp.org>
Mon, 29 Jan 2007 23:42:58 +0000 (18:42 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 45be86820lJypN1X3a0k_GDuASaGrg

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge