Module Name: src
Committed By: christos
Date: Sun May 1 23:32:02 UTC 2016
Modified Files:
src/external/bsd/ntp: importdate
src/external/bsd/ntp/bin/ntpd: Makefile
src/external/bsd/ntp/dist/include: ntp.h ntp_io.h ntp_refclock.h
ntp_stdlib.h ntp_types.h ntp_worker.h parse.h recvbuff.h
src/external/bsd/ntp/dist/lib/isc: hmacmd5.c hmacsha.c
src/external/bsd/ntp/dist/lib/isc/include/isc: string.h
src/external/bsd/ntp/dist/libntp: a_md5encrypt.c authkeys.c
authreadkeys.c authusekey.c ntp_intres.c ntp_worker.c recvbuff.c
systime.c work_fork.c work_thread.c
src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c
ntp_control.c ntp_crypto.c ntp_io.c ntp_keyword.h ntp_parser.y
ntp_proto.c ntp_request.c ntp_scanner.c ntp_timer.c ntpd-opts.c
ntpd-opts.h ntpd.c refclock_chu.c refclock_gpsdjson.c
refclock_jjy.c refclock_shm.c
src/external/bsd/ntp/dist/ntpdate: ntpdate.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h ntpdc.c
src/external/bsd/ntp/dist/ntpq: ntpq-opts.c ntpq-opts.h ntpq-subs.c
ntpq.c ntpq.h
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/sntp: crypto.c crypto.h main.c networking.c
sntp-opts.c sntp-opts.h
src/external/bsd/ntp/dist/sntp/libevent: evconfig-private.h
src/external/bsd/ntp/dist/sntp/libevent/test: regress.gen.c
regress.gen.h
src/external/bsd/ntp/dist/sntp/libopts: configfile.c enum.c find.c
init.c load.c makeshell.c nested.c parse-duration.c reset.c save.c
tokenize.c
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/lib/libiscntp: Makefile
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.8 -r1.9 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/bin/ntpd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/ntp.h \
src/external/bsd/ntp/dist/include/ntp_types.h \
src/external/bsd/ntp/dist/include/parse.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_io.h \
src/external/bsd/ntp/dist/include/ntp_refclock.h \
src/external/bsd/ntp/dist/include/ntp_worker.h \
src/external/bsd/ntp/dist/include/recvbuff.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/include/ntp_stdlib.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/hmacmd5.c \
src/external/bsd/ntp/dist/lib/isc/hmacsha.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/ntp/dist/lib/isc/include/isc/string.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c \
src/external/bsd/ntp/dist/libntp/authusekey.c \
src/external/bsd/ntp/dist/libntp/systime.c \
src/external/bsd/ntp/dist/libntp/work_thread.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/libntp/authkeys.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/authreadkeys.c \
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/libntp/ntp_worker.c \
src/external/bsd/ntp/dist/libntp/recvbuff.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/keyword-gen.c \
src/external/bsd/ntp/dist/ntpd/refclock_chu.c \
src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_config.c \
src/external/bsd/ntp/dist/ntpd/ntp_request.c
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/ntp_control.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.h \
src/external/bsd/ntp/dist/ntpd/refclock_jjy.c
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpd/ntp_parser.y \
src/external/bsd/ntp/dist/ntpd/ntpd.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_proto.c \
src/external/bsd/ntp/dist/ntpd/ntp_scanner.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_timer.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/refclock_shm.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpdate/ntpdate.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpq/ntpq.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/crypto.h
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/sntp/main.c
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/sntp/networking.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/ntp/dist/sntp/libevent/evconfig-private.h
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/libopts/configfile.c \
src/external/bsd/ntp/dist/sntp/libopts/enum.c \
src/external/bsd/ntp/dist/sntp/libopts/init.c \
src/external/bsd/ntp/dist/sntp/libopts/load.c \
src/external/bsd/ntp/dist/sntp/libopts/makeshell.c \
src/external/bsd/ntp/dist/sntp/libopts/reset.c \
src/external/bsd/ntp/dist/sntp/libopts/tokenize.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/libopts/find.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/sntp/libopts/nested.c \
src/external/bsd/ntp/dist/sntp/libopts/save.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/ntp/dist/sntp/libopts/parse-duration.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/lib/libiscntp/Makefile
cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/lib/libntp/Makefile
cvs rdiff -u -r1.9 -r1.10 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.
