]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7e9076 41884df)
Merge psp-deb1.ntp.org:/home/karlsson/ntp-dev
authorLinux Karlsson <karlsson@ntp.org>
Fri, 29 Oct 2010 15:01:40 +0000 (11:01 -0400)
committerLinux Karlsson <karlsson@ntp.org>
Fri, 29 Oct 2010 15:01:40 +0000 (11:01 -0400)
into  psp-deb1.ntp.org:/home/karlsson/ntp-gsoc-testing

bk: 4ccae1d47ygFJssONrHPeV7dAQ6wWA

1  2 
Makefile.am patch | diff1 | diff2 | blob | history

diff --cc Makefile.am
Simple merge
Mirror of https://github.com/ntp-project/ntp.git