]> git.ipfire.org Git - thirdparty/ntp.git/commit
[bug 3576+3577] manual merge with staging area
authorJuergen Perlinger <perlinger@ntp.org>
Tue, 13 Aug 2019 19:00:16 +0000 (21:00 +0200)
committerJuergen Perlinger <perlinger@ntp.org>
Tue, 13 Aug 2019 19:00:16 +0000 (21:00 +0200)
commit068156bb57c461b45eb440663eee8345152d417e
treed5c808f37a31084c2e012ffa24a4b0225be92883
parentc8a6bad4bb8766bf410a9b9dbdbc8d0dc2e1dfab
parent83dac2a7a6238c74bc5c4af90a84813893233e19
[bug 3576+3577] manual merge with staging area

bk: 5d5308c0gtPvqGZF3M4QmmxnanOuww
ChangeLog
html/drivers/driver20.html
libntp/Makefile.am
tests/libntp/run-calendar.c