]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-p10
authorHarlan Stenn <stenn@ntp.org>
Tue, 7 Mar 2017 10:46:54 +0000 (10:46 +0000)
committerHarlan Stenn <stenn@ntp.org>
Tue, 7 Mar 2017 10:46:54 +0000 (10:46 +0000)
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable-aes128cmac

bk: 58be8f9ezbVAjR_BMt5Tsnhn4L0rYw

1  2 
ntpq/ntpq.c

diff --cc ntpq/ntpq.c
Simple merge