]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Sat, 15 Nov 2008 00:51:15 +0000 (19:51 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 15 Nov 2008 00:51:15 +0000 (19:51 -0500)
into  pogo.udel.edu:/pogo/users/stenn/ntp-dev-kuehn

bk: 491e1d03UYRmh1fmRLCcfd2riQo2yQ

1  2 
Makefile.am
configure.ac

diff --cc Makefile.am
Simple merge
diff --cc configure.ac
Simple merge