]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06d586e 0cd3ec3)
Merge psp-at1.ntp.org:/home/stenn/ntp-stable-unity
authorHarlan Stenn <stenn@ntp.org>
Fri, 12 Jun 2015 10:00:29 +0000 (10:00 +0000)
committerHarlan Stenn <stenn@ntp.org>
Fri, 12 Jun 2015 10:00:29 +0000 (10:00 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/viperus/ntp-stable-unity

bk: 557aadbdiz8bCVRwuHYHSmoynHTXlw


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