]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4ce1b26 e8642ff)
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p11
authorHarlan Stenn <stenn@ntp.org>
Sat, 10 Feb 2018 01:16:09 +0000 (01:16 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 10 Feb 2018 01:16:09 +0000 (01:16 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-p11-3457

bk: 5a7e47d9TErsdop0ShTsIO4gkNdEng

1  2 
ChangeLog patch | diff1 | diff2 | blob | history
ntpd/ntp_control.c patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
diff --cc ntpd/ntp_control.c
Simple merge
Mirror of https://github.com/ntp-project/ntp.git