Module Name: src
Committed By: christos
Date: Tue Nov 22 03:09:31 UTC 2016
Modified Files:
src/external/bsd/ntp: importdate
src/external/bsd/ntp/dist/include: ntp.h ntp_intres.h ntpd.h
src/external/bsd/ntp/dist/lib/isc: netaddr.c
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c audio.c ntp_calendar.c
ntp_intres.c ssl_init.c work_fork.c
src/external/bsd/ntp/dist/libparse: clk_hopf6021.c
src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c
ntp_control.c ntp_crypto.c ntp_keyword.h ntp_loopfilter.c
ntp_parser.y ntp_peer.c ntp_proto.c ntp_refclock.c ntpd-opts.c
ntpd-opts.h refclock_gpsdjson.c refclock_jjy.c refclock_jupiter.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h ntpq.c
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: crypto.c sntp-opts.c sntp-opts.h
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
ntp-keygen.c
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/lib/libntp: Makefile
src/external/bsd/ntp/scripts: mkver
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_intres.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/include/ntpd.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/lib/isc/netaddr.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/libntp/audio.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/ntp_calendar.c \
src/external/bsd/ntp/dist/libntp/ssl_init.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/libntp/ntp_intres.c \
src/external/bsd/ntp/dist/libntp/work_fork.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libparse/clk_hopf6021.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/keyword-gen.c \
src/external/bsd/ntp/dist/ntpd/refclock_jjy.c \
src/external/bsd/ntp/dist/ntpd/refclock_jupiter.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/dist/ntpd/ntp_control.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c \
src/external/bsd/ntp/dist/ntpd/ntp_peer.c \
src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \
src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/util/ntp-keygen.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/scripts/mkver
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
