]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c97eea2 6ffa564)
Merge psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorTomasz Flendrich <tflendrich@ntp.org>
Fri, 19 Jun 2015 00:50:36 +0000 (00:50 +0000)
committerTomasz Flendrich <tflendrich@ntp.org>
Fri, 19 Jun 2015 00:50:36 +0000 (00:50 +0000)
into  psp-deb1.ntp.org:/home/tflendrich/develpment/harlans/ntp-stable-unity

bk: 5583675cEC-ncHJAEELI71KpifWXyA


Trivial merge
Mirror of https://github.com/ntp-project/ntp.git