]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge bk://bk.ntp.org/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Mon, 20 Sep 2010 12:36:30 +0000 (14:36 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Mon, 20 Sep 2010 12:36:30 +0000 (14:36 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c97554el9Qw7hGrMBgfMk1iBL3zcQ

1  2 
configure.ac

diff --cc configure.ac
Simple merge