]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorJohannes Maximilian Kuehn <kuehn@ntp.org>
Fri, 14 Nov 2008 21:34:41 +0000 (21:34 +0000)
committerJohannes Maximilian Kuehn <kuehn@ntp.org>
Fri, 14 Nov 2008 21:34:41 +0000 (21:34 +0000)
into  pogo.udel.edu:/pogo/users/kuehn/rsync_repo/ntp-dev

bk: 491deef1TZXtfjizdJKQEXeVNXVFiA

1  2 
Makefile.am
configure.ac

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