CVS commit: src/external/bsd/ntp

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Fri Jun  3 20:39:03 UTC 2016

Modified Files:
        src/external/bsd/ntp: importdate
        src/external/bsd/ntp/dist/include: ntp.h
        src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c ntp_io.c
            ntp_keyword.h ntp_parser.y ntp_proto.c ntpd-opts.c ntpd-opts.h
            refclock_parse.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.c
        src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h
        src/external/bsd/ntp/dist/sntp: sntp-opts.c sntp-opts.h
        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/scripts: mkver

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/importdate
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/include/ntp.h
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/keyword-gen.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/ntp_config.c
cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
    src/external/bsd/ntp/dist/ntpd/ntpd-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_parser.y
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/ntp_proto.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntpd-opts.c
cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \
    src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
    src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
    src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.10 -r1.11 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.