Module Name: src
Committed By: christos
Date: Tue Apr 7 17:34:21 UTC 2015
Modified Files:
src/external/bsd/ntp: importdate ntp2netbsd
src/external/bsd/ntp/dist/include: audio.h binio.h icom.h mbg_gps166.h
ntp.h ntp_calendar.h ntp_config.h ntp_filegen.h ntp_fp.h ntp_md5.h
ntp_stdlib.h ntpd.h parse.h parse_conf.h timepps-Solaris.h
src/external/bsd/ntp/dist/kernel/sys: parsestreams.h
src/external/bsd/ntp/dist/lib/isc: backtrace.c event.c inet_ntop.c
log.c netaddr.c result.c sockaddr.c
src/external/bsd/ntp/dist/lib/isc/include/isc: backtrace.h socket.h
src/external/bsd/ntp/dist/lib/isc/unix: file.c ifiter_getifaddrs.c
ifiter_ioctl.c net.c
src/external/bsd/ntp/dist/libjsmn: jsmn.c
src/external/bsd/ntp/dist/libntp: atoint.c atolfp.c atouint.c audio.c
authkeys.c authreadkeys.c emalloc.c hextoint.c hextolfp.c
humandate.c icom.c modetoa.c mstolfp.c ntp_calendar.c
ntp_crypto_rnd.c ntp_intres.c ntp_lineedit.c octtoint.c
prettydate.c ssl_init.c timetoa.c work_fork.c
src/external/bsd/ntp/dist/libparse: clk_computime.c clk_dcf7000.c
clk_hopf6021.c clk_meinberg.c clk_rawdcf.c clk_rcc8000.c
clk_schmid.c clk_sel240x.c clk_trimtaip.c clk_trimtsip.c
clk_varitext.c clk_wharton.c data_mbg.c gpstolfp.c info_trimble.c
parse.c parse_conf.c parsesolaris.c parsestreams.c trim_info.c
src/external/bsd/ntp/dist/ntpd: cmd_args.c keyword-gen.c ntp_config.c
ntp_control.c ntp_crypto.c ntp_filegen.c ntp_io.c ntp_keyword.h
ntp_leapsec.c ntp_loopfilter.c ntp_parser.y ntp_peer.c ntp_proto.c
ntp_request.c ntp_restrict.c ntp_scanner.c ntp_util.c ntpd-opts.c
ntpd-opts.h ntpd.c refclock_acts.c refclock_arc.c refclock_chu.c
refclock_gpsdjson.c refclock_heath.c refclock_irig.c refclock_jjy.c
refclock_jupiter.c refclock_neoclock4x.c refclock_nmea.c
refclock_oncore.c refclock_palisade.c refclock_palisade.h
refclock_parse.c refclock_pcf.c refclock_shm.c refclock_true.c
refclock_wwv.c
src/external/bsd/ntp/dist/ntpdate: ntpdate.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.c ntpdc-opts.h ntpdc.c
ntpdc.h ntpdc_ops.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: netsnmp_daemonize.c ntp_snmp.h
ntpsnmpd-opts.c ntpsnmpd-opts.h
src/external/bsd/ntp/dist/parseutil: dcfd.c testdcf.c
src/external/bsd/ntp/dist/sntp: crypto.c main.c networking.c
sntp-opts.c sntp-opts.h
src/external/bsd/ntp/dist/sntp/libevent: buffer.c bufferevent.c
bufferevent_async.c bufferevent_filter.c bufferevent_openssl.c
bufferevent_pair.c evbuffer-internal.h evdns.c event.c
event_tagging.c evrpc-internal.h evthread-internal.h evthread.c
evutil.c evutil_time.c ht-internal.h http-internal.h http.c
kqueue.c listener.c time-internal.h util-internal.h
src/external/bsd/ntp/dist/sntp/libevent/WIN32-Code: tree.h
src/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2:
event-config.h
src/external/bsd/ntp/dist/sntp/libevent/include/event2: buffer.h
bufferevent.h dns.h event.h http.h listener.h util.h
src/external/bsd/ntp/dist/sntp/libevent/sample: http-server.c
https-client.c
src/external/bsd/ntp/dist/sntp/libevent/test: regress.c regress.h
regress_buffer.c regress_bufferevent.c regress_dns.c
regress_finalize.c regress_http.c regress_main.c regress_minheap.c
regress_ssl.c regress_thread.c regress_util.c regress_zlib.c
test-fdleak.c test-ratelim.c test-time.c tinytest.c tinytest.h
tinytest_macros.h
src/external/bsd/ntp/dist/sntp/libopts: autoopts.h configfile.c enum.c
file.c find.c init.c load.c makeshell.c nested.c numeric.c
parse-duration.c pgusage.c reset.c save.c tokenize.c usage.c
src/external/bsd/ntp/dist/sntp/libopts/autoopts: options.h
src/external/bsd/ntp/dist/util: jitter.c ntp-keygen-opts.c
ntp-keygen-opts.h ntp-keygen.c ntptime.c
src/external/bsd/ntp/include: config.h
src/external/bsd/ntp/scripts: mkver
Removed Files:
src/external/bsd/ntp/dist/sntp/libevent: README
src/external/bsd/ntp/dist/sntp/libevent/m4: openldap-thread-check.m4
openldap.m4
src/external/bsd/ntp/dist/util: jitter.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/importdate \
src/external/bsd/ntp/ntp2netbsd
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/include/audio.h \
src/external/bsd/ntp/dist/include/icom.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/include/binio.h \
src/external/bsd/ntp/dist/include/mbg_gps166.h \
src/external/bsd/ntp/dist/include/ntp.h \
src/external/bsd/ntp/dist/include/ntp_calendar.h \
src/external/bsd/ntp/dist/include/ntp_md5.h \
src/external/bsd/ntp/dist/include/parse.h \
src/external/bsd/ntp/dist/include/parse_conf.h \
src/external/bsd/ntp/dist/include/timepps-Solaris.h
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/include/ntp_config.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_filegen.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/ntp_fp.h \
src/external/bsd/ntp/dist/include/ntpd.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/ntp_stdlib.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/kernel/sys/parsestreams.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/lib/isc/backtrace.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/event.c \
src/external/bsd/ntp/dist/lib/isc/inet_ntop.c \
src/external/bsd/ntp/dist/lib/isc/log.c \
src/external/bsd/ntp/dist/lib/isc/result.c \
src/external/bsd/ntp/dist/lib/isc/sockaddr.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/lib/isc/netaddr.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h \
src/external/bsd/ntp/dist/lib/isc/include/isc/socket.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/unix/file.c \
src/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/lib/isc/unix/net.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libjsmn/jsmn.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libntp/atoint.c \
src/external/bsd/ntp/dist/libntp/atolfp.c \
src/external/bsd/ntp/dist/libntp/authkeys.c \
src/external/bsd/ntp/dist/libntp/authreadkeys.c \
src/external/bsd/ntp/dist/libntp/hextoint.c \
src/external/bsd/ntp/dist/libntp/hextolfp.c \
src/external/bsd/ntp/dist/libntp/mstolfp.c \
src/external/bsd/ntp/dist/libntp/ntp_calendar.c \
src/external/bsd/ntp/dist/libntp/ntp_intres.c \
src/external/bsd/ntp/dist/libntp/octtoint.c \
src/external/bsd/ntp/dist/libntp/prettydate.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libntp/atouint.c \
src/external/bsd/ntp/dist/libntp/humandate.c \
src/external/bsd/ntp/dist/libntp/icom.c \
src/external/bsd/ntp/dist/libntp/modetoa.c \
src/external/bsd/ntp/dist/libntp/ntp_lineedit.c \
src/external/bsd/ntp/dist/libntp/ssl_init.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/audio.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libntp/emalloc.c \
src/external/bsd/ntp/dist/libntp/timetoa.c \
src/external/bsd/ntp/dist/libntp/work_fork.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libntp/ntp_crypto_rnd.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libparse/clk_computime.c \
src/external/bsd/ntp/dist/libparse/clk_dcf7000.c \
src/external/bsd/ntp/dist/libparse/clk_hopf6021.c \
src/external/bsd/ntp/dist/libparse/clk_rcc8000.c \
src/external/bsd/ntp/dist/libparse/clk_schmid.c \
src/external/bsd/ntp/dist/libparse/clk_sel240x.c \
src/external/bsd/ntp/dist/libparse/clk_trimtaip.c \
src/external/bsd/ntp/dist/libparse/clk_trimtsip.c \
src/external/bsd/ntp/dist/libparse/clk_varitext.c \
src/external/bsd/ntp/dist/libparse/clk_wharton.c \
src/external/bsd/ntp/dist/libparse/gpstolfp.c \
src/external/bsd/ntp/dist/libparse/parse.c \
src/external/bsd/ntp/dist/libparse/parse_conf.c \
src/external/bsd/ntp/dist/libparse/parsesolaris.c \
src/external/bsd/ntp/dist/libparse/parsestreams.c \
src/external/bsd/ntp/dist/libparse/trim_info.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libparse/clk_meinberg.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libparse/clk_rawdcf.c \
src/external/bsd/ntp/dist/libparse/info_trimble.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/libparse/data_mbg.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/ntpd/cmd_args.c \
src/external/bsd/ntp/dist/ntpd/ntp_leapsec.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.c \
src/external/bsd/ntp/dist/ntpd/refclock_palisade.c \
src/external/bsd/ntp/dist/ntpd/refclock_palisade.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/keyword-gen.c \
src/external/bsd/ntp/dist/ntpd/ntp_filegen.c \
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_util.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.h \
src/external/bsd/ntp/dist/ntpd/refclock_arc.c \
src/external/bsd/ntp/dist/ntpd/refclock_heath.c \
src/external/bsd/ntp/dist/ntpd/refclock_irig.c \
src/external/bsd/ntp/dist/ntpd/refclock_pcf.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/ntp_config.c \
src/external/bsd/ntp/dist/ntpd/ntp_request.c \
src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_control.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_crypto.c \
src/external/bsd/ntp/dist/ntpd/ntp_scanner.c \
src/external/bsd/ntp/dist/ntpd/refclock_nmea.c
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntp_proto.c \
src/external/bsd/ntp/dist/ntpd/refclock_jjy.c \
src/external/bsd/ntp/dist/ntpd/refclock_jupiter.c \
src/external/bsd/ntp/dist/ntpd/refclock_neoclock4x.c
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/ntp_parser.y \
src/external/bsd/ntp/dist/ntpd/ntpd.c \
src/external/bsd/ntp/dist/ntpd/refclock_acts.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/ntp_restrict.c \
src/external/bsd/ntp/dist/ntpd/refclock_chu.c \
src/external/bsd/ntp/dist/ntpd/refclock_gpsdjson.c
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpd/refclock_shm.c \
src/external/bsd/ntp/dist/ntpd/refclock_true.c \
src/external/bsd/ntp/dist/ntpd/refclock_wwv.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpdate/ntpdate.c
cvs rdiff -u -r1.2 -r1.3 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/ntpdc/ntpdc.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpdc/ntpdc.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/ntpq/ntpq-opts.c \
src/external/bsd/ntp/dist/ntpq/ntpq-opts.h
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpq/ntpq.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/ntpsnmpd/netsnmp_daemonize.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntp_snmp.h \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/parseutil/dcfd.c \
src/external/bsd/ntp/dist/parseutil/testdcf.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/crypto.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/sntp/main.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/sntp/networking.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/sntp-opts.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/sntp/libevent/README
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/libevent/buffer.c \
src/external/bsd/ntp/dist/sntp/libevent/bufferevent.c \
src/external/bsd/ntp/dist/sntp/libevent/bufferevent_async.c \
src/external/bsd/ntp/dist/sntp/libevent/bufferevent_filter.c \
src/external/bsd/ntp/dist/sntp/libevent/bufferevent_openssl.c \
src/external/bsd/ntp/dist/sntp/libevent/bufferevent_pair.c \
src/external/bsd/ntp/dist/sntp/libevent/evbuffer-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/evdns.c \
src/external/bsd/ntp/dist/sntp/libevent/event.c \
src/external/bsd/ntp/dist/sntp/libevent/event_tagging.c \
src/external/bsd/ntp/dist/sntp/libevent/evrpc-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/evthread-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/evthread.c \
src/external/bsd/ntp/dist/sntp/libevent/evutil.c \
src/external/bsd/ntp/dist/sntp/libevent/evutil_time.c \
src/external/bsd/ntp/dist/sntp/libevent/ht-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/http-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/http.c \
src/external/bsd/ntp/dist/sntp/libevent/kqueue.c \
src/external/bsd/ntp/dist/sntp/libevent/listener.c \
src/external/bsd/ntp/dist/sntp/libevent/time-internal.h \
src/external/bsd/ntp/dist/sntp/libevent/util-internal.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/tree.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libevent/WIN32-Code/nmake/event2/event-config.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/buffer.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/bufferevent.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/dns.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/event.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/http.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/listener.h \
src/external/bsd/ntp/dist/sntp/libevent/include/event2/util.h
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/sntp/libevent/m4/openldap-thread-check.m4
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ntp/dist/sntp/libevent/m4/openldap.m4
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libevent/sample/http-server.c \
src/external/bsd/ntp/dist/sntp/libevent/sample/https-client.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libevent/test/regress.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress.h \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_buffer.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_bufferevent.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_dns.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_finalize.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_http.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_main.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_minheap.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_ssl.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_thread.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_util.c \
src/external/bsd/ntp/dist/sntp/libevent/test/regress_zlib.c \
src/external/bsd/ntp/dist/sntp/libevent/test/test-fdleak.c \
src/external/bsd/ntp/dist/sntp/libevent/test/test-ratelim.c \
src/external/bsd/ntp/dist/sntp/libevent/test/test-time.c \
src/external/bsd/ntp/dist/sntp/libevent/test/tinytest.c \
src/external/bsd/ntp/dist/sntp/libevent/test/tinytest.h \
src/external/bsd/ntp/dist/sntp/libevent/test/tinytest_macros.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/libopts/autoopts.h
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/libopts/configfile.c \
src/external/bsd/ntp/dist/sntp/libopts/file.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/numeric.c \
src/external/bsd/ntp/dist/sntp/libopts/reset.c \
src/external/bsd/ntp/dist/sntp/libopts/tokenize.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/libopts/enum.c \
src/external/bsd/ntp/dist/sntp/libopts/find.c \
src/external/bsd/ntp/dist/sntp/libopts/pgusage.c \
src/external/bsd/ntp/dist/sntp/libopts/usage.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/libopts/nested.c \
src/external/bsd/ntp/dist/sntp/libopts/save.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/ntp/dist/sntp/libopts/parse-duration.c
cvs rdiff -u -r1.8 -r1.9 \
src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/util/jitter.c \
src/external/bsd/ntp/dist/util/ntp-keygen-opts.h
cvs rdiff -u -r1.3 -r0 src/external/bsd/ntp/dist/util/jitter.h
cvs rdiff -u -r1.7 -r1.8 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.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/util/ntptime.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/include/config.h
cvs rdiff -u -r1.5 -r1.6 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.
