]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 840b257 6717dc1)
Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Tue, 3 Aug 2010 13:10:33 +0000 (15:10 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Tue, 3 Aug 2010 13:10:33 +0000 (15:10 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c581549uPbQIAgoOuCXMtOPgnvCFQ


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