Module Name: src Committed By: christos Date: Sat Sep 29 21:52:35 UTC 2018
Modified Files: src/external/bsd/ntp: importdate src/external/bsd/ntp/dist: configure.ac src/external/bsd/ntp/dist/include: ntp.h ntp_debug.h ntp_md5.h src/external/bsd/ntp/dist/include/isc: mem.h src/external/bsd/ntp/dist/kernel/sys: bsd_audioirig.h src/external/bsd/ntp/dist/lib/isc: app_api.c assertions.c backtrace-emptytbl.c backtrace.c base32.c base64.c bitstring.c buffer.c bufferlist.c commandline.c entropy.c error.c event.c fsaccess.c hash.c hex.c hmacmd5.c inet_aton.c inet_ntop.c inet_pton.c iterated_hash.c lex.c lfsr.c lib.c md5.c mem_api.c netscope.c ondestroy.c parseint.c portset.c print.c quota.c random.c ratelimiter.c refcount.c region.c serial.c sha1.c strtoul.c timer_api.c timer_p.h tsmemcmp.c version.c src/external/bsd/ntp/dist/lib/isc/alpha/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/ia64/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/include/isc: app.h assertions.h backtrace.h base32.h base64.h bind9.h bitstring.h boolean.h buffer.h bufferlist.h commandline.h entropy.h error.h event.h eventclass.h formatcheck.h fsaccess.h hash.h heap.h hex.h hmacmd5.h hmacsha.h httpd.h interfaceiter.h ipv6.h iterated_hash.h lang.h lex.h lfsr.h lib.h log.h magic.h md5.h msgcat.h msgs.h mutexblock.h netaddr.h netscope.h ondestroy.h os.h parseint.h platform.h platform.h.in portset.h print.h quota.h radix.h random.h ratelimiter.h refcount.h region.h resource.h resultclass.h rwlock.h serial.h sha1.h sha2.h sockaddr.h stdio.h stdlib.h string.h timer.h version.h xml.h src/external/bsd/ntp/dist/lib/isc/mips/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/nls: msgcat.c src/external/bsd/ntp/dist/lib/isc/noatomic/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/nothreads: condition.c mutex.c thread.c src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc: condition.h mutex.h once.h thread.h src/external/bsd/ntp/dist/lib/isc/pthreads: condition.c mutex.c thread.c src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc: condition.h mutex.h once.h thread.h src/external/bsd/ntp/dist/lib/isc/sparc64/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/unix: app.c entropy.c fsaccess.c ifiter_getifaddrs.c ifiter_ioctl.c ifiter_sysctl.c interfaceiter.c ipv6.c keyboard.c os.c resource.c socket_p.h stdtime.c strerror.c syslog.c src/external/bsd/ntp/dist/lib/isc/unix/include/isc: dir.h int.h keyboard.h netdb.h offset.h stat.h strerror.h syslog.h time.h src/external/bsd/ntp/dist/lib/isc/win32: DLLMain.c app.c condition.c entropy.c errno2result.c errno2result.h fsaccess.c interfaceiter.c ipv6.c keyboard.c libgen.h netdb.h ntgroups.c ntpaths.c once.c os.c resource.c stdio.c stdtime.c strerror.c syslog.c syslog.h thread.c time.c unistd.h version.c win32os.c src/external/bsd/ntp/dist/lib/isc/win32/include/isc: bind_registry.h bindevt.h condition.h dir.h int.h keyboard.h mutex.h netdb.h ntgroups.h ntpaths.h offset.h once.h platform.h stat.h strerror.h syslog.h thread.h time.h win32os.h src/external/bsd/ntp/dist/lib/isc/x86_32/include/isc: atomic.h src/external/bsd/ntp/dist/lib/isc/x86_64/include/isc: atomic.h src/external/bsd/ntp/dist/libntp: a_md5encrypt.c prettydate.c snprintf.c ssl_init.c syssignal.c work_fork.c work_thread.c src/external/bsd/ntp/dist/ntpd: ntp_config.c ntp_control.c ntp_keyword.h ntp_loopfilter.c ntp_parser.y ntp_proto.c ntp_refclock.c ntp_request.c ntpd-opts.c ntpd-opts.h ntpd.c refclock_ripencc.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 src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.c ntpsnmpd-opts.h src/external/bsd/ntp/dist/scripts: plot_summary.in summary.in src/external/bsd/ntp/dist/scripts/ntpsweep: ntpsweep.in src/external/bsd/ntp/dist/sntp: crypto.c main.c sntp-opts.c sntp-opts.h version.c src/external/bsd/ntp/dist/sntp/libevent/compat/sys: queue.h src/external/bsd/ntp/dist/sntp/libevent/test: regress.gen.c src/external/bsd/ntp/dist/sntp/m4: snprintf.m4 src/external/bsd/ntp/dist/sntp/tests: crypto.c packetProcessing.c src/external/bsd/ntp/dist/tests/libntp: ssl_init.c src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen-opts.h sht.c tg2.c src/external/bsd/ntp/include: config.h Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/importdate cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/configure.ac cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/include/ntp.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/ntp_debug.h cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/include/ntp_md5.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/include/isc/mem.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/app_api.c \ src/external/bsd/ntp/dist/lib/isc/assertions.c \ src/external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c \ src/external/bsd/ntp/dist/lib/isc/base32.c \ src/external/bsd/ntp/dist/lib/isc/base64.c \ src/external/bsd/ntp/dist/lib/isc/bitstring.c \ src/external/bsd/ntp/dist/lib/isc/buffer.c \ src/external/bsd/ntp/dist/lib/isc/bufferlist.c \ src/external/bsd/ntp/dist/lib/isc/commandline.c \ src/external/bsd/ntp/dist/lib/isc/entropy.c \ src/external/bsd/ntp/dist/lib/isc/error.c \ src/external/bsd/ntp/dist/lib/isc/fsaccess.c \ src/external/bsd/ntp/dist/lib/isc/hash.c \ src/external/bsd/ntp/dist/lib/isc/hex.c \ src/external/bsd/ntp/dist/lib/isc/inet_aton.c \ src/external/bsd/ntp/dist/lib/isc/iterated_hash.c \ src/external/bsd/ntp/dist/lib/isc/lex.c \ src/external/bsd/ntp/dist/lib/isc/lfsr.c \ src/external/bsd/ntp/dist/lib/isc/lib.c \ src/external/bsd/ntp/dist/lib/isc/md5.c \ src/external/bsd/ntp/dist/lib/isc/mem_api.c \ src/external/bsd/ntp/dist/lib/isc/netscope.c \ src/external/bsd/ntp/dist/lib/isc/ondestroy.c \ src/external/bsd/ntp/dist/lib/isc/parseint.c \ src/external/bsd/ntp/dist/lib/isc/portset.c \ src/external/bsd/ntp/dist/lib/isc/print.c \ src/external/bsd/ntp/dist/lib/isc/quota.c \ src/external/bsd/ntp/dist/lib/isc/random.c \ src/external/bsd/ntp/dist/lib/isc/ratelimiter.c \ src/external/bsd/ntp/dist/lib/isc/refcount.c \ src/external/bsd/ntp/dist/lib/isc/region.c \ src/external/bsd/ntp/dist/lib/isc/serial.c \ src/external/bsd/ntp/dist/lib/isc/sha1.c \ src/external/bsd/ntp/dist/lib/isc/strtoul.c \ src/external/bsd/ntp/dist/lib/isc/timer_api.c \ src/external/bsd/ntp/dist/lib/isc/timer_p.h \ src/external/bsd/ntp/dist/lib/isc/version.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/lib/isc/backtrace.c cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/lib/isc/event.c \ src/external/bsd/ntp/dist/lib/isc/inet_ntop.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/lib/isc/hmacmd5.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/lib/isc/inet_pton.c cvs rdiff -u -r1.1.1.2 -r1.2 src/external/bsd/ntp/dist/lib/isc/tsmemcmp.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/include/isc/app.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/assertions.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/base32.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/base64.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/bind9.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/boolean.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/buffer.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/commandline.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/entropy.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/error.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/event.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/hash.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/heap.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/hex.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/httpd.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/lang.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/lex.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/lib.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/log.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/magic.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/md5.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/msgs.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/netscope.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/os.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/parseint.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/platform.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/portset.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/print.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/quota.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/radix.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/random.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/refcount.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/region.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/resource.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/serial.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/sha1.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/sha2.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/stdio.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/timer.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/version.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/xml.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h \ src/external/bsd/ntp/dist/lib/isc/include/isc/string.h cvs rdiff -u -r1.1.1.7 -r1.2 \ src/external/bsd/ntp/dist/lib/isc/include/isc/platform.h.in cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/nls/msgcat.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/noatomic/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/nothreads/condition.c \ src/external/bsd/ntp/dist/lib/isc/nothreads/mutex.c \ src/external/bsd/ntp/dist/lib/isc/nothreads/thread.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/condition.h \ src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/mutex.h \ src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/once.h \ src/external/bsd/ntp/dist/lib/isc/nothreads/include/isc/thread.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/pthreads/condition.c \ src/external/bsd/ntp/dist/lib/isc/pthreads/mutex.c \ src/external/bsd/ntp/dist/lib/isc/pthreads/thread.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/condition.h \ src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/mutex.h \ src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/once.h \ src/external/bsd/ntp/dist/lib/isc/pthreads/include/isc/thread.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/sparc64/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/unix/app.c \ src/external/bsd/ntp/dist/lib/isc/unix/entropy.c \ src/external/bsd/ntp/dist/lib/isc/unix/fsaccess.c \ src/external/bsd/ntp/dist/lib/isc/unix/ifiter_sysctl.c \ src/external/bsd/ntp/dist/lib/isc/unix/interfaceiter.c \ src/external/bsd/ntp/dist/lib/isc/unix/ipv6.c \ src/external/bsd/ntp/dist/lib/isc/unix/keyboard.c \ src/external/bsd/ntp/dist/lib/isc/unix/os.c \ src/external/bsd/ntp/dist/lib/isc/unix/resource.c \ src/external/bsd/ntp/dist/lib/isc/unix/socket_p.h \ src/external/bsd/ntp/dist/lib/isc/unix/stdtime.c \ src/external/bsd/ntp/dist/lib/isc/unix/strerror.c \ src/external/bsd/ntp/dist/lib/isc/unix/syslog.c cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/ntp/dist/lib/isc/unix/ifiter_ioctl.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/dir.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/int.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/keyboard.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/netdb.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/offset.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/stat.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/strerror.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/syslog.h \ src/external/bsd/ntp/dist/lib/isc/unix/include/isc/time.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/lib/isc/win32/DLLMain.c \ src/external/bsd/ntp/dist/lib/isc/win32/app.c \ src/external/bsd/ntp/dist/lib/isc/win32/condition.c \ src/external/bsd/ntp/dist/lib/isc/win32/entropy.c \ src/external/bsd/ntp/dist/lib/isc/win32/errno2result.c \ src/external/bsd/ntp/dist/lib/isc/win32/errno2result.h \ src/external/bsd/ntp/dist/lib/isc/win32/fsaccess.c \ src/external/bsd/ntp/dist/lib/isc/win32/interfaceiter.c \ src/external/bsd/ntp/dist/lib/isc/win32/ipv6.c \ src/external/bsd/ntp/dist/lib/isc/win32/keyboard.c \ src/external/bsd/ntp/dist/lib/isc/win32/libgen.h \ src/external/bsd/ntp/dist/lib/isc/win32/netdb.h \ src/external/bsd/ntp/dist/lib/isc/win32/ntgroups.c \ src/external/bsd/ntp/dist/lib/isc/win32/ntpaths.c \ src/external/bsd/ntp/dist/lib/isc/win32/once.c \ src/external/bsd/ntp/dist/lib/isc/win32/os.c \ src/external/bsd/ntp/dist/lib/isc/win32/resource.c \ src/external/bsd/ntp/dist/lib/isc/win32/stdio.c \ src/external/bsd/ntp/dist/lib/isc/win32/stdtime.c \ src/external/bsd/ntp/dist/lib/isc/win32/strerror.c \ src/external/bsd/ntp/dist/lib/isc/win32/syslog.c \ src/external/bsd/ntp/dist/lib/isc/win32/syslog.h \ src/external/bsd/ntp/dist/lib/isc/win32/thread.c \ src/external/bsd/ntp/dist/lib/isc/win32/time.c \ src/external/bsd/ntp/dist/lib/isc/win32/unistd.h \ src/external/bsd/ntp/dist/lib/isc/win32/version.c \ src/external/bsd/ntp/dist/lib/isc/win32/win32os.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/bind_registry.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/bindevt.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/condition.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/dir.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/int.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/keyboard.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/mutex.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/netdb.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntgroups.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/ntpaths.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/offset.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/once.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/platform.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/stat.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/strerror.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/syslog.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/thread.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/time.h \ src/external/bsd/ntp/dist/lib/isc/win32/include/isc/win32os.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/x86_32/include/isc/atomic.h cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/lib/isc/x86_64/include/isc/atomic.h cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/libntp/a_md5encrypt.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/libntp/prettydate.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libntp/snprintf.c \ src/external/bsd/ntp/dist/libntp/syssignal.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/libntp/ssl_init.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/libntp/work_fork.c cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/libntp/work_thread.c cvs rdiff -u -r1.18 -r1.19 src/external/bsd/ntp/dist/ntpd/ntp_config.c cvs rdiff -u -r1.20 -r1.21 src/external/bsd/ntp/dist/ntpd/ntp_control.c cvs rdiff -u -r1.13 -r1.14 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpd/ntp_loopfilter.c \ src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \ src/external/bsd/ntp/dist/ntpd/ntpd-opts.c cvs rdiff -u -r1.17 -r1.18 src/external/bsd/ntp/dist/ntpd/ntp_parser.y cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpd/ntp_proto.c cvs rdiff -u -r1.15 -r1.16 src/external/bsd/ntp/dist/ntpd/ntp_request.c \ src/external/bsd/ntp/dist/ntpd/ntpd.c cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/ntpd/ntpd-opts.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/refclock_ripencc.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpd/refclock_shm.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpdate/ntpdate.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.c \ src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.h cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/ntpdc/ntpdc.c cvs rdiff -u -r1.11 -r1.12 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-subs.c cvs rdiff -u -r1.19 -r1.20 src/external/bsd/ntp/dist/ntpq/ntpq.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.c \ src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.h cvs rdiff -u -r1.1.1.7 -r1.2 \ src/external/bsd/ntp/dist/scripts/plot_summary.in \ src/external/bsd/ntp/dist/scripts/summary.in cvs rdiff -u -r1.1.1.7 -r1.2 \ src/external/bsd/ntp/dist/scripts/ntpsweep/ntpsweep.in cvs rdiff -u -r1.14 -r1.15 src/external/bsd/ntp/dist/sntp/crypto.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/sntp/main.c cvs rdiff -u -r1.12 -r1.13 src/external/bsd/ntp/dist/sntp/sntp-opts.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/sntp/sntp-opts.h cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/version.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/ntp/dist/sntp/libevent/compat/sys/queue.h cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/ntp/dist/sntp/libevent/test/regress.gen.c cvs rdiff -u -r1.1.1.6 -r1.2 src/external/bsd/ntp/dist/sntp/m4/snprintf.m4 cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/tests/crypto.c \ src/external/bsd/ntp/dist/sntp/tests/packetProcessing.c cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/tests/libntp/ssl_init.c cvs rdiff -u -r1.16 -r1.17 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/dist/util/ntp-keygen-opts.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/util/sht.c \ src/external/bsd/ntp/dist/util/tg2.c cvs rdiff -u -r1.22 -r1.23 src/external/bsd/ntp/include/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.