]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e202b2 1e54ac6)
Merge lokeshw24@psp-deb1.ntp.org:/home/viperus/ntp-stable-unity
authorLokesh Walase <lokeshw24@ntp.org>
Wed, 1 Jul 2015 09:38:54 +0000 (15:08 +0530)
committerLokesh Walase <lokeshw24@ntp.org>
Wed, 1 Jul 2015 09:38:54 +0000 (15:08 +0530)
into  dadasgift.(none):/home/loki/ntp_gsoc/2_damir_code/ntp-stable-unity

bk: 5593b52eEyittZiuw4RYw_a4FEq9Yg


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