]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bce5d3 130b8ce)
Merge hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3095
authorJuergen Perlinger <perlinger@ntp.org>
Wed, 28 Sep 2016 19:55:03 +0000 (21:55 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Wed, 28 Sep 2016 19:55:03 +0000 (21:55 +0200)
into  hydra.localnet:/home/jnperlin/Projects/Packages/NTP-DEV/src/ntp-stable-3059-conflict

bk: 57ec2017cXK7hSwjtvFym6RDHv9Ikw


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