]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: adb9e35 3aa66b6)
Merge ssh://tflendrich@psp-deb1.ntp.org//home/tflendrich/kod/packetProcessing/ntp...
authorTomek Mrugalski <tomasz@isc.org>
Thu, 25 Jun 2015 09:33:21 +0000 (11:33 +0200)
committerTomek Mrugalski <tomasz@isc.org>
Thu, 25 Jun 2015 09:33:21 +0000 (11:33 +0200)
into  tomek-n56vz.(none):/home/tomek/ntp/packetProcessing/ntp-stable-unity

bk: 558bcae1uQsyT7FxrWVYAquF4DIaaw


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