]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc63f03 32cf937)
Merge psp-at1.ntp.org:/home/viperus/ntp-stable-unity
authorHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 20:25:03 +0000 (20:25 +0000)
committerHarlan Stenn <stenn@ntp.org>
Sat, 20 Jun 2015 20:25:03 +0000 (20:25 +0000)
into  psp-at1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-unity

bk: 5585cc1fnNmysPe6Cf-KdbCw02ZJXA


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