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

bk: 4c52b446GekSsoo_u9AQXQhlrLEhmA


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