Module Name: src
Committed By: christos
Date: Sat Dec 28 03:20:15 UTC 2013
Modified Files:
src/external/bsd/ntp/dist/include: ntp_config.h ntp_filegen.h ntp_fp.h
ntp_request.h ntp_stdlib.h ntpd.h refclock_atom.h
src/external/bsd/ntp/dist/lib/isc: backtrace.c event.c inet_ntop.c
inet_pton.c log.c netaddr.c result.c sockaddr.c
src/external/bsd/ntp/dist/lib/isc/include/isc: util.h
src/external/bsd/ntp/dist/lib/isc/unix: file.c ifiter_getifaddrs.c
net.c socket.c time.c
src/external/bsd/ntp/dist/libntp: atoint.c atolfp.c atouint.c audio.c
authkeys.c authreadkeys.c hextoint.c hextolfp.c humandate.c
modetoa.c mstolfp.c ntp_calendar.c ntp_lineedit.c octtoint.c
prettydate.c ssl_init.c
src/external/bsd/ntp/dist/libparse: clk_rawdcf.c data_mbg.c
info_trimble.c
src/external/bsd/ntp/dist/ntpd: keyword-gen.c ntp_config.c
ntp_control.c ntp_crypto.c ntp_filegen.c ntp_io.c ntp_keyword.h
ntp_loopfilter.c ntp_parser.c ntp_parser.h ntp_parser.y ntp_peer.c
ntp_proto.c ntp_refclock.c ntp_request.c ntp_restrict.c
ntp_scanner.c ntp_util.c ntpd-opts.h ntpd.c refclock_acts.c
refclock_arc.c refclock_chu.c refclock_datum.c refclock_heath.c
refclock_irig.c refclock_jjy.c refclock_jupiter.c
refclock_neoclock4x.c refclock_nmea.c refclock_oncore.c
refclock_parse.c refclock_pcf.c refclock_shm.c refclock_wwvb.c
src/external/bsd/ntp/dist/ntpdate: ntpdate.c
src/external/bsd/ntp/dist/ntpdc: nl.pl ntpdc.c ntpdc.h ntpdc_ops.c
src/external/bsd/ntp/dist/ntpq: ntpq-subs.c ntpq.c ntpq.h
src/external/bsd/ntp/dist/sntp: crypto.c kod_management.c log.c log.h
main.c networking.c networking.h sntp-opts.c
src/external/bsd/ntp/dist/sntp/libopts: autoopts.c 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 putshell.c reset.c
save.c stack.c streqvcmp.c tokenize.c usage.c
src/external/bsd/ntp/dist/sntp/libopts/autoopts: options.h
src/external/bsd/ntp/dist/sntp/libopts/compat: pathfind.c
src/external/bsd/ntp/dist/util: ntp-keygen-opts.c ntp-keygen.c
ntptime.c
Removed Files:
src/external/bsd/ntp/dist: compile config.guess config.sub depcomp
excludes ltmain.sh missing version version.m4 ylwrap
src/external/bsd/ntp/dist/ElectricFence: CHANGES COPYING Makefile.am
Makefile.in README efence.c efence.h eftest.c libefence.3 page.c
print.c tstheap.c
src/external/bsd/ntp/dist/arlib: COPYING INSTALL Makefile.am
Makefile.in README UNSHAR.HDR aclocal.m4 arlib.3 arlib.c arlib.h
arplib.h configure configure.in depcomp install-sh missing sample.c
src/external/bsd/ntp/dist/clockstuff: clktest.c
src/external/bsd/ntp/dist/html: gadget.html manyopt.html
src/external/bsd/ntp/dist/html/description_files: description.jpg
src/external/bsd/ntp/dist/html/drivers: driver2.html
src/external/bsd/ntp/dist/include: autogen-version.def copyright.def
debug-opt.def homerc.def ntp_data_structures.h ntp_sprintf.h
version.def version.texi
src/external/bsd/ntp/dist/kernel: README chuinit.c clkinit.c tty_chu.c
tty_chu_STREAMS.c tty_clk.c tty_clk_STREAMS.c
src/external/bsd/ntp/dist/kernel/sys: chudefs.h clkdefs.h
src/external/bsd/ntp/dist/libntp: fptoa.c fptoms.c inttoa.c memmove.c
mfptoa.c mfptoms.c msutotsf.c strstr.c tsftomsu.c tstotv.c tvtots.c
uinttoa.c
src/external/bsd/ntp/dist/libopts: COPYING.gplv3 COPYING.lgplv3
COPYING.mbsd MakeDefs.inc Makefile.am Makefile.in README
ag-char-map.h autoopts.c autoopts.h boolean.c configfile.c cook.c
enumeration.c environment.c file.c genshell.c genshell.h libopts.c
load.c makeshell.c nested.c numeric.c parse-duration.c
parse-duration.h pgusage.c proto.h putshell.c reset.c restore.c
save.c sort.c stack.c streqvcmp.c text_mmap.c time.c tokenize.c
usage.c value-type.c value-type.h version.c xat-attribute.c
xat-attribute.h
src/external/bsd/ntp/dist/libopts/autoopts: options.h usage-txt.h
src/external/bsd/ntp/dist/libopts/compat: compat.h pathfind.c
snprintf.c strchr.c strdup.c windows-config.h
src/external/bsd/ntp/dist/libopts/m4: libopts.m4 liboptschk.m4
src/external/bsd/ntp/dist/m4: define_dir.m4 libtool.m4 ltoptions.m4
ltsugar.m4 ltversion.m4 lt~obsolete.m4 ntp_cacheversion.m4
ntp_dir_sep.m4 ntp_lib_m.m4 ntp_lineeditlibs.m4 ntp_openssl.m4
ntp_vpathhack.m4 os_cflags.m4
src/external/bsd/ntp/dist/ntpd: .deps-ver complete.conf
ntp_data_structures.c ntp_intres.c ntpd-opts.menu ntpd-opts.texi
ntpd.1 refclock_trak.c
src/external/bsd/ntp/dist/ntpdate: ntptime_config.c ntptimeset.c
src/external/bsd/ntp/dist/ntpdc: ntpdc-opts.menu ntpdc-opts.texi
ntpdc.1
src/external/bsd/ntp/dist/ntpq: ntpq-opts.menu ntpq-opts.texi ntpq.1
src/external/bsd/ntp/dist/ntpsnmpd: ntpsnmpd-opts.menu
ntpsnmpd-opts.texi ntpsnmpd.1
src/external/bsd/ntp/dist/scripts: UpdatePoint VersionName
calc_tickadj.in check--help checkChangeLog checktime.in cvo.sh
fixautomakedepsmagic freq_adj.in genCommitLog genver hpadjtime.sh
html2man.in mkver.in ntp-close ntp-groper ntp-restart ntp-status
ntp-wait.in ntpsweep.in ntptrace.in
src/external/bsd/ntp/dist/scripts/rc1: postinstall preinstall preremove
prototype xntp
src/external/bsd/ntp/dist/scripts/rc2: local.ntpd
src/external/bsd/ntp/dist/sntp: autogen-version.def compile
config.guess config.sub depcomp header.h ltmain.sh missing
sntp-opts.menu sntp-opts.texi sntp.1 version.def version.m4
version.texi
src/external/bsd/ntp/dist/sntp/libopts: enumeration.c environment.c
value-type.c value-type.h xat-attribute.c xat-attribute.h
src/external/bsd/ntp/dist/util: ansi2knr.1 ansi2knr.c
ntp-keygen-opts.menu ntp-keygen-opts.texi ntp-keygen.1
Log Message:
resolve conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/compile \
src/external/bsd/ntp/dist/depcomp src/external/bsd/ntp/dist/excludes \
src/external/bsd/ntp/dist/missing src/external/bsd/ntp/dist/ylwrap
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/config.guess \
src/external/bsd/ntp/dist/config.sub src/external/bsd/ntp/dist/ltmain.sh \
src/external/bsd/ntp/dist/version src/external/bsd/ntp/dist/version.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/ElectricFence/CHANGES \
src/external/bsd/ntp/dist/ElectricFence/COPYING \
src/external/bsd/ntp/dist/ElectricFence/Makefile.am \
src/external/bsd/ntp/dist/ElectricFence/README \
src/external/bsd/ntp/dist/ElectricFence/efence.c \
src/external/bsd/ntp/dist/ElectricFence/efence.h \
src/external/bsd/ntp/dist/ElectricFence/eftest.c \
src/external/bsd/ntp/dist/ElectricFence/libefence.3 \
src/external/bsd/ntp/dist/ElectricFence/page.c \
src/external/bsd/ntp/dist/ElectricFence/print.c \
src/external/bsd/ntp/dist/ElectricFence/tstheap.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/ElectricFence/Makefile.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/arlib/COPYING \
src/external/bsd/ntp/dist/arlib/INSTALL \
src/external/bsd/ntp/dist/arlib/Makefile.am \
src/external/bsd/ntp/dist/arlib/Makefile.in \
src/external/bsd/ntp/dist/arlib/README \
src/external/bsd/ntp/dist/arlib/UNSHAR.HDR \
src/external/bsd/ntp/dist/arlib/aclocal.m4 \
src/external/bsd/ntp/dist/arlib/arlib.3 \
src/external/bsd/ntp/dist/arlib/arlib.c \
src/external/bsd/ntp/dist/arlib/arlib.h \
src/external/bsd/ntp/dist/arlib/arplib.h \
src/external/bsd/ntp/dist/arlib/configure \
src/external/bsd/ntp/dist/arlib/configure.in \
src/external/bsd/ntp/dist/arlib/depcomp \
src/external/bsd/ntp/dist/arlib/install-sh \
src/external/bsd/ntp/dist/arlib/missing \
src/external/bsd/ntp/dist/arlib/sample.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/clockstuff/clktest.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/html/gadget.html \
src/external/bsd/ntp/dist/html/manyopt.html
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ntp/dist/html/description_files/description.jpg
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ntp/dist/html/drivers/driver2.html
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/include/autogen-version.def \
src/external/bsd/ntp/dist/include/copyright.def \
src/external/bsd/ntp/dist/include/version.def \
src/external/bsd/ntp/dist/include/version.texi
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/include/debug-opt.def \
src/external/bsd/ntp/dist/include/homerc.def \
src/external/bsd/ntp/dist/include/ntp_data_structures.h \
src/external/bsd/ntp/dist/include/ntp_sprintf.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/include/ntp_config.h \
src/external/bsd/ntp/dist/include/ntp_fp.h \
src/external/bsd/ntp/dist/include/ntp_request.h \
src/external/bsd/ntp/dist/include/ntpd.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/include/ntp_filegen.h \
src/external/bsd/ntp/dist/include/refclock_atom.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/include/ntp_stdlib.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/kernel/README \
src/external/bsd/ntp/dist/kernel/chuinit.c \
src/external/bsd/ntp/dist/kernel/clkinit.c \
src/external/bsd/ntp/dist/kernel/tty_chu.c \
src/external/bsd/ntp/dist/kernel/tty_chu_STREAMS.c \
src/external/bsd/ntp/dist/kernel/tty_clk.c \
src/external/bsd/ntp/dist/kernel/tty_clk_STREAMS.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/kernel/sys/chudefs.h \
src/external/bsd/ntp/dist/kernel/sys/clkdefs.h
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/lib/isc/backtrace.c
cvs rdiff -u -r1.2 -r1.3 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.3 -r1.4 src/external/bsd/ntp/dist/lib/isc/inet_pton.c \
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/util.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/lib/isc/unix/file.c \
src/external/bsd/ntp/dist/lib/isc/unix/ifiter_getifaddrs.c \
src/external/bsd/ntp/dist/lib/isc/unix/socket.c \
src/external/bsd/ntp/dist/lib/isc/unix/time.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/lib/isc/unix/net.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libntp/atoint.c \
src/external/bsd/ntp/dist/libntp/atolfp.c \
src/external/bsd/ntp/dist/libntp/atouint.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/octtoint.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/libntp/audio.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/libntp/fptoa.c \
src/external/bsd/ntp/dist/libntp/fptoms.c \
src/external/bsd/ntp/dist/libntp/memmove.c \
src/external/bsd/ntp/dist/libntp/mfptoa.c \
src/external/bsd/ntp/dist/libntp/mfptoms.c \
src/external/bsd/ntp/dist/libntp/msutotsf.c \
src/external/bsd/ntp/dist/libntp/strstr.c \
src/external/bsd/ntp/dist/libntp/tsftomsu.c \
src/external/bsd/ntp/dist/libntp/tstotv.c \
src/external/bsd/ntp/dist/libntp/tvtots.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/libntp/humandate.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.1.1.2 -r0 src/external/bsd/ntp/dist/libntp/inttoa.c \
src/external/bsd/ntp/dist/libntp/uinttoa.c
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/libntp/ntp_calendar.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/libntp/prettydate.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/libopts/COPYING.gplv3 \
src/external/bsd/ntp/dist/libopts/COPYING.lgplv3 \
src/external/bsd/ntp/dist/libopts/COPYING.mbsd \
src/external/bsd/ntp/dist/libopts/MakeDefs.inc \
src/external/bsd/ntp/dist/libopts/Makefile.am \
src/external/bsd/ntp/dist/libopts/Makefile.in \
src/external/bsd/ntp/dist/libopts/README \
src/external/bsd/ntp/dist/libopts/ag-char-map.h \
src/external/bsd/ntp/dist/libopts/boolean.c \
src/external/bsd/ntp/dist/libopts/cook.c \
src/external/bsd/ntp/dist/libopts/environment.c \
src/external/bsd/ntp/dist/libopts/genshell.c \
src/external/bsd/ntp/dist/libopts/genshell.h \
src/external/bsd/ntp/dist/libopts/libopts.c \
src/external/bsd/ntp/dist/libopts/numeric.c \
src/external/bsd/ntp/dist/libopts/parse-duration.h \
src/external/bsd/ntp/dist/libopts/pgusage.c \
src/external/bsd/ntp/dist/libopts/proto.h \
src/external/bsd/ntp/dist/libopts/restore.c \
src/external/bsd/ntp/dist/libopts/sort.c \
src/external/bsd/ntp/dist/libopts/text_mmap.c \
src/external/bsd/ntp/dist/libopts/time.c \
src/external/bsd/ntp/dist/libopts/value-type.c \
src/external/bsd/ntp/dist/libopts/value-type.h \
src/external/bsd/ntp/dist/libopts/xat-attribute.c \
src/external/bsd/ntp/dist/libopts/xat-attribute.h
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/dist/libopts/autoopts.c \
src/external/bsd/ntp/dist/libopts/enumeration.c \
src/external/bsd/ntp/dist/libopts/file.c \
src/external/bsd/ntp/dist/libopts/load.c \
src/external/bsd/ntp/dist/libopts/makeshell.c \
src/external/bsd/ntp/dist/libopts/nested.c \
src/external/bsd/ntp/dist/libopts/parse-duration.c \
src/external/bsd/ntp/dist/libopts/putshell.c \
src/external/bsd/ntp/dist/libopts/reset.c \
src/external/bsd/ntp/dist/libopts/stack.c \
src/external/bsd/ntp/dist/libopts/streqvcmp.c \
src/external/bsd/ntp/dist/libopts/tokenize.c \
src/external/bsd/ntp/dist/libopts/usage.c \
src/external/bsd/ntp/dist/libopts/version.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/ntp/dist/libopts/autoopts.h \
src/external/bsd/ntp/dist/libopts/configfile.c \
src/external/bsd/ntp/dist/libopts/save.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/dist/libopts/autoopts/options.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ntp/dist/libopts/autoopts/usage-txt.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/libopts/compat/compat.h \
src/external/bsd/ntp/dist/libopts/compat/snprintf.c \
src/external/bsd/ntp/dist/libopts/compat/strchr.c \
src/external/bsd/ntp/dist/libopts/compat/strdup.c \
src/external/bsd/ntp/dist/libopts/compat/windows-config.h
cvs rdiff -u -r1.4 -r0 src/external/bsd/ntp/dist/libopts/compat/pathfind.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/libopts/m4/libopts.m4 \
src/external/bsd/ntp/dist/libopts/m4/liboptschk.m4
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/libparse/clk_rawdcf.c \
src/external/bsd/ntp/dist/libparse/data_mbg.c \
src/external/bsd/ntp/dist/libparse/info_trimble.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/m4/define_dir.m4 \
src/external/bsd/ntp/dist/m4/ntp_cacheversion.m4 \
src/external/bsd/ntp/dist/m4/ntp_dir_sep.m4 \
src/external/bsd/ntp/dist/m4/ntp_lineeditlibs.m4 \
src/external/bsd/ntp/dist/m4/ntp_vpathhack.m4 \
src/external/bsd/ntp/dist/m4/os_cflags.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/m4/libtool.m4 \
src/external/bsd/ntp/dist/m4/ltoptions.m4 \
src/external/bsd/ntp/dist/m4/ltsugar.m4 \
src/external/bsd/ntp/dist/m4/ltversion.m4 \
src/external/bsd/ntp/dist/m4/lt~obsolete.m4 \
src/external/bsd/ntp/dist/m4/ntp_lib_m.m4 \
src/external/bsd/ntp/dist/m4/ntp_openssl.m4
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/ntpd/.deps-ver \
src/external/bsd/ntp/dist/ntpd/ntp_data_structures.c \
src/external/bsd/ntp/dist/ntpd/ntpd-opts.menu
cvs rdiff -u -r1.3 -r0 src/external/bsd/ntp/dist/ntpd/complete.conf
cvs rdiff -u -r1.3 -r1.4 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_parser.h \
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_pcf.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/ntp_config.c \
src/external/bsd/ntp/dist/ntpd/ntp_crypto.c \
src/external/bsd/ntp/dist/ntpd/ntp_parser.c \
src/external/bsd/ntp/dist/ntpd/ntp_parser.y \
src/external/bsd/ntp/dist/ntpd/refclock_acts.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpd/ntp_control.c \
src/external/bsd/ntp/dist/ntpd/ntpd.c
cvs rdiff -u -r1.4 -r0 src/external/bsd/ntp/dist/ntpd/ntp_intres.c
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/ntp/dist/ntpd/ntp_io.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpd/ntp_keyword.h \
src/external/bsd/ntp/dist/ntpd/ntp_proto.c \
src/external/bsd/ntp/dist/ntpd/ntp_refclock.c \
src/external/bsd/ntp/dist/ntpd/ntp_scanner.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 \
src/external/bsd/ntp/dist/ntpd/refclock_nmea.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/ntpd/ntp_request.c \
src/external/bsd/ntp/dist/ntpd/refclock_oncore.c
cvs rdiff -u -r1.2 -r1.3 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_datum.c \
src/external/bsd/ntp/dist/ntpd/refclock_irig.c \
src/external/bsd/ntp/dist/ntpd/refclock_wwvb.c
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/ntpd/ntpd-opts.texi \
src/external/bsd/ntp/dist/ntpd/ntpd.1 \
src/external/bsd/ntp/dist/ntpd/refclock_trak.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/ntp/dist/ntpd/refclock_parse.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/ntpd/refclock_shm.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpdate/ntpdate.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/ntpdate/ntptime_config.c \
src/external/bsd/ntp/dist/ntpdate/ntptimeset.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/ntpdc/nl.pl \
src/external/bsd/ntp/dist/ntpdc/ntpdc.h
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.menu
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/ntpdc/ntpdc-opts.texi \
src/external/bsd/ntp/dist/ntpdc/ntpdc.1
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/ntpdc/ntpdc.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpdc/ntpdc_ops.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/ntpq/ntpq-opts.menu
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/ntpq/ntpq-opts.texi
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/ntpq/ntpq-subs.c
cvs rdiff -u -r1.3 -r0 src/external/bsd/ntp/dist/ntpq/ntpq.1
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/ntp/dist/ntpq/ntpq.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/ntpq/ntpq.h
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.menu
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd-opts.texi \
src/external/bsd/ntp/dist/ntpsnmpd/ntpsnmpd.1
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/scripts/UpdatePoint \
src/external/bsd/ntp/dist/scripts/calc_tickadj.in \
src/external/bsd/ntp/dist/scripts/check--help \
src/external/bsd/ntp/dist/scripts/checkChangeLog \
src/external/bsd/ntp/dist/scripts/checktime.in \
src/external/bsd/ntp/dist/scripts/fixautomakedepsmagic \
src/external/bsd/ntp/dist/scripts/freq_adj.in \
src/external/bsd/ntp/dist/scripts/genver \
src/external/bsd/ntp/dist/scripts/hpadjtime.sh \
src/external/bsd/ntp/dist/scripts/ntp-close \
src/external/bsd/ntp/dist/scripts/ntp-groper \
src/external/bsd/ntp/dist/scripts/ntp-restart \
src/external/bsd/ntp/dist/scripts/ntp-status \
src/external/bsd/ntp/dist/scripts/ntp-wait.in \
src/external/bsd/ntp/dist/scripts/ntpsweep.in \
src/external/bsd/ntp/dist/scripts/ntptrace.in
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/scripts/VersionName \
src/external/bsd/ntp/dist/scripts/cvo.sh \
src/external/bsd/ntp/dist/scripts/genCommitLog \
src/external/bsd/ntp/dist/scripts/html2man.in \
src/external/bsd/ntp/dist/scripts/mkver.in
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/scripts/rc1/postinstall \
src/external/bsd/ntp/dist/scripts/rc1/preinstall \
src/external/bsd/ntp/dist/scripts/rc1/preremove \
src/external/bsd/ntp/dist/scripts/rc1/prototype \
src/external/bsd/ntp/dist/scripts/rc1/xntp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/scripts/rc2/local.ntpd
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/ntp/dist/sntp/autogen-version.def \
src/external/bsd/ntp/dist/sntp/config.guess \
src/external/bsd/ntp/dist/sntp/config.sub \
src/external/bsd/ntp/dist/sntp/header.h \
src/external/bsd/ntp/dist/sntp/ltmain.sh \
src/external/bsd/ntp/dist/sntp/sntp-opts.texi \
src/external/bsd/ntp/dist/sntp/sntp.1 \
src/external/bsd/ntp/dist/sntp/version.def \
src/external/bsd/ntp/dist/sntp/version.m4 \
src/external/bsd/ntp/dist/sntp/version.texi
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/sntp/compile \
src/external/bsd/ntp/dist/sntp/depcomp \
src/external/bsd/ntp/dist/sntp/missing \
src/external/bsd/ntp/dist/sntp/sntp-opts.menu
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/crypto.c \
src/external/bsd/ntp/dist/sntp/networking.h
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ntp/dist/sntp/kod_management.c \
src/external/bsd/ntp/dist/sntp/log.h
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/sntp/log.c
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/ntp/dist/sntp/main.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/ntp/dist/sntp/networking.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/sntp/sntp-opts.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/sntp/libopts/autoopts.c \
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/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/putshell.c \
src/external/bsd/ntp/dist/sntp/libopts/reset.c \
src/external/bsd/ntp/dist/sntp/libopts/streqvcmp.c \
src/external/bsd/ntp/dist/sntp/libopts/tokenize.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/sntp/libopts/autoopts.h \
src/external/bsd/ntp/dist/sntp/libopts/nested.c \
src/external/bsd/ntp/dist/sntp/libopts/save.c
cvs rdiff -u -r1.1.1.1 -r1.2 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/init.c
cvs rdiff -u -r1.2 -r0 src/external/bsd/ntp/dist/sntp/libopts/enumeration.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/sntp/libopts/environment.c \
src/external/bsd/ntp/dist/sntp/libopts/value-type.c \
src/external/bsd/ntp/dist/sntp/libopts/value-type.h \
src/external/bsd/ntp/dist/sntp/libopts/xat-attribute.c \
src/external/bsd/ntp/dist/sntp/libopts/xat-attribute.h
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/ntp/dist/sntp/libopts/parse-duration.c \
src/external/bsd/ntp/dist/sntp/libopts/stack.c
cvs rdiff -u -r1.1.1.3 -r1.2 src/external/bsd/ntp/dist/sntp/libopts/pgusage.c \
src/external/bsd/ntp/dist/sntp/libopts/usage.c
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/ntp/dist/sntp/libopts/autoopts/options.h
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/ntp/dist/sntp/libopts/compat/pathfind.c
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/ntp/dist/util/ansi2knr.1 \
src/external/bsd/ntp/dist/util/ansi2knr.c \
src/external/bsd/ntp/dist/util/ntp-keygen-opts.menu
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ntp/dist/util/ntp-keygen-opts.c \
src/external/bsd/ntp/dist/util/ntp-keygen.c
cvs rdiff -u -r1.1.1.2 -r0 \
src/external/bsd/ntp/dist/util/ntp-keygen-opts.texi \
src/external/bsd/ntp/dist/util/ntp-keygen.1
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ntp/dist/util/ntptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
