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

bk: 557ab135asnWvFtNSaxGKRJjJvs8VQ

1  2 
sntp/unity/Makefile.am patch | diff1 | diff2 | blob | history

diff --cc sntp/unity/Makefile.am
Simple merge
Mirror of https://github.com/ntp-project/ntp.git