]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e96aaeb 1ae97e9)
Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2971
authorHarlan Stenn <stenn@ntp.org>
Thu, 14 Jan 2016 11:29:40 +0000 (11:29 +0000)
committerHarlan Stenn <stenn@ntp.org>
Thu, 14 Jan 2016 11:29:40 +0000 (11:29 +0000)
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6+

bk: 569786a4LyI9nUmgl4iZdPS_eu2K2w

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

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