]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
projects / thirdparty / ntp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c014d9c 9ac1f17)
Merge psp-deb1.ntp.org:/home/hart/ntp-dev-1764-murray
authorHarlan Stenn <stenn@ntp.org>
Sat, 1 Jan 2011 01:39:20 +0000 (20:39 -0500)
committerHarlan Stenn <stenn@ntp.org>
Sat, 1 Jan 2011 01:39:20 +0000 (20:39 -0500)
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d1e85c8TeZ9PiNIHiHf2pGTqt3jgA

1  2 
ChangeLog patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
Mirror of https://github.com/ntp-project/ntp.git