]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fb5e25e b2f591e)
Merge beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/sntp-refactoring-dev
authorLinux Karlsson <karlsson@ntp.org>
Sat, 21 Aug 2010 10:13:23 +0000 (12:13 +0200)
committerLinux Karlsson <karlsson@ntp.org>
Sat, 21 Aug 2010 10:13:23 +0000 (12:13 +0200)
into  beam.lund.zozs.se:/home/linus/programming/gsoc/ntp/ntp-gsoc-testing

bk: 4c6fa6c3ii4l2ulvdREOxgn3xREihA


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