]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e1b6de5 f31d2ad)
Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Fri, 30 Jul 2010 10:37:40 +0000 (12:37 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Fri, 30 Jul 2010 10:37:40 +0000 (12:37 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c52ab74sY98bhLOIOy2GVReeRlTlA


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