]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge stenn.ntp.org:/home/karlsson/ntp-dev
authorHarlan Stenn <stenn@ntp.org>
Fri, 29 Oct 2010 00:04:27 +0000 (17:04 -0700)
committerHarlan Stenn <stenn@ntp.org>
Fri, 29 Oct 2010 00:04:27 +0000 (17:04 -0700)
into  stenn.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/karlsson/ntp-gsoc-testing

bk: 4cca0f8bA5MeOkgmJb-yVEO4AYFuKQ

1  2 
Makefile.am
configure.ac

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