]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 302301b 9aac2bf)
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Sun, 26 Jul 2015 21:24:39 +0000 (21:24 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Sun, 26 Jul 2015 21:24:39 +0000 (21:24 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/ntpd_tests/ntp-stable-unity

bk: 55b55017wGS3Wyna2XJYVp2K4RdK4A

1  2 
ChangeLog patch | diff1 | diff2 | blob | history
tests/ntpd/Makefile.am patch | diff1 | diff2 | blob | history

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