]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Fri, 5 Jan 2007 05:36:15 +0000 (00:36 -0500)
committerHarlan Stenn <stenn@ntp.org>
Fri, 5 Jan 2007 05:36:15 +0000 (00:36 -0500)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 459de3cfcHtI-e_nBAuynPhA_1jyFw

1  2 
Makefile.am

diff --cc Makefile.am
Simple merge