]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge ntp-build.tal1.ntfo.org:/export/home/u1/harlan/ntp-stable-p13-sec
authorHarlan Stenn <stenn@ntp.org>
Tue, 3 Mar 2020 12:10:02 +0000 (04:10 -0800)
committerHarlan Stenn <stenn@ntp.org>
Tue, 3 Mar 2020 12:10:02 +0000 (04:10 -0800)
into  ntp-build.tal1.ntfo.org:/export/home/u1/harlan/ntp-stable-merge

bk: 5e5e491ackmWLsifRmHUYM1yix4f6Q

1  2 
ntpd/ntp_control.c

Simple merge