git.ipfire.org Git - thirdparty/ntp.git/commit

]> git.ipfire.org Git - thirdparty/ntp.git/commit

projects / thirdparty / ntp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ca2cf90 b23acf2)

author	Harlan Stenn <stenn@ntp.org>
	Tue, 28 Dec 2010 08:52:52 +0000 (03:52 -0500)
committer	Harlan Stenn <stenn@ntp.org>
	Tue, 28 Dec 2010 08:52:52 +0000 (03:52 -0500)
commit	e57df34c83f65cc3fa47f2d360e358a8f88e7bfc
tree	9e11bbfa58561f6bd99bd7f540b687b246d4c2a4	tree \| snapshot
parent	ca2cf900eecd0cae0b0a3b1fe1c6f7d189be33c6	commit \| diff
parent	b23acf2c3fa9819b257f549ceddd3a5da8509bd6	commit \| diff

Merge deacon.udel.edu:/deacon/backroom/ntp-stable
into deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 4d19a564_1kIbKoAag6NElA5O9kN3A

ChangeLog	diff1 \|	diff2 \|	blob \| history
ntpd/Makefile.am	diff1 \|	diff2 \|	blob \| history
ntpq/Makefile.am	diff1 \|	diff2 \|	blob \| history
sntp/Makefile.am	diff1 \|	diff2 \|	blob \| history
util/Makefile.am	diff1 \|	diff2 \|	blob \| history

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