]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Tue, 13 Jun 2006 08:50:52 +0000 (04:50 -0400)
committerHarlan Stenn <stenn@ntp.org>
Tue, 13 Jun 2006 08:50:52 +0000 (04:50 -0400)
into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 448e7c6c2x9aS4Zs-5V1Mx9Nk69mbg

1  2 
Makefile.am
packageinfo.sh

diff --cc Makefile.am
Simple merge
diff --cc packageinfo.sh
Simple merge