]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge pogo.udel.edu:/pogo/users/stenn/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Thu, 11 Sep 2008 00:27:06 +0000 (20:27 -0400)
committerHarlan Stenn <stenn@ntp.org>
Thu, 11 Sep 2008 00:27:06 +0000 (20:27 -0400)
into  pogo.udel.edu:/pogo/users/kuehn/rsync_repo/ntp-dev

bk: 48c865daq9fSzctny317CGzv3sqX2g

1  2 
Makefile.am
configure.ac

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