]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1a5f80 58ded4e)
Merge lokeshw24@psp-deb1.ntp.org:/home/stenn/ntp-stable-unity
authorLokesh Walase <lokeshw24@ntp.org>
Sat, 13 Jun 2015 09:26:47 +0000 (14:56 +0530)
committerLokesh Walase <lokeshw24@ntp.org>
Sat, 13 Jun 2015 09:26:47 +0000 (14:56 +0530)
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 557bf757cEsUssgGmDMZ3Y3ysUI7Ww


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