]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02402e4 abe39df)
Merge deacon.udel.edu:/deacon/backroom/ntp-stable
authorHarlan Stenn <stenn@ntp.org>
Mon, 22 Jun 2015 07:56:45 +0000 (03:56 -0400)
committerHarlan Stenn <stenn@ntp.org>
Mon, 22 Jun 2015 07:56:45 +0000 (03:56 -0400)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 5587bfbdFO4AeizKR5Hs6-FaO3VWVw

1  2 
ChangeLog patch | diff1 | diff2 | blob | history

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