Module Name:	src
Committed By:	kardel
Date:		Sun Jun 24 16:55:15 UTC 2007

Modified Files:
	src/dist/ntp: config.h.in configure ntp2netbsd
	src/dist/ntp/html: copyright.html
	src/dist/ntp/include: parse.h recvbuff.h
	src/dist/ntp/libntp: ntp_rfc2553.c recvbuff.c
	src/dist/ntp/libopts: autoopts.c configfile.c enumeration.c makeshell.c
	    putshell.c save.c version.c
	src/dist/ntp/ntpd: ntp_io.c ntp_loopfilter.c ntp_peer.c ntpd.c
	src/dist/ntp/ntpdate: ntpdate.c
	src/dist/ntp/scripts: ntpsweep.in
	src/dist/ntp/util: ntp-keygen.c
Removed Files:
	src/dist/ntp: ChangeLog-4.1.0
	src/dist/ntp/libopts/m4: libtool.m4
	src/dist/ntp/scripts: genChangeLog
	src/dist/ntp/sntp/libopts/m4: libtool.m4

Log Message:
resolve merge conflicts of 4.2.4p2 import


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r0 src/dist/ntp/ChangeLog-4.1.0
cvs rdiff -r1.5 -r1.6 src/dist/ntp/config.h.in src/dist/ntp/ntp2netbsd
cvs rdiff -r1.6 -r1.7 src/dist/ntp/configure
cvs rdiff -r1.2 -r1.3 src/dist/ntp/html/copyright.html
cvs rdiff -r1.3 -r1.4 src/dist/ntp/include/parse.h \
    src/dist/ntp/include/recvbuff.h
cvs rdiff -r1.4 -r1.5 src/dist/ntp/libntp/ntp_rfc2553.c \
    src/dist/ntp/libntp/recvbuff.c
cvs rdiff -r1.2 -r1.3 src/dist/ntp/libopts/autoopts.c \
    src/dist/ntp/libopts/configfile.c src/dist/ntp/libopts/enumeration.c \
    src/dist/ntp/libopts/makeshell.c src/dist/ntp/libopts/putshell.c \
    src/dist/ntp/libopts/save.c
cvs rdiff -r1.1.1.2 -r1.2 src/dist/ntp/libopts/version.c
cvs rdiff -r1.1.1.1 -r0 src/dist/ntp/libopts/m4/libtool.m4
cvs rdiff -r1.23 -r1.24 src/dist/ntp/ntpd/ntp_io.c
cvs rdiff -r1.7 -r1.8 src/dist/ntp/ntpd/ntp_loopfilter.c
cvs rdiff -r1.4 -r1.5 src/dist/ntp/ntpd/ntp_peer.c
cvs rdiff -r1.11 -r1.12 src/dist/ntp/ntpd/ntpd.c
cvs rdiff -r1.7 -r1.8 src/dist/ntp/ntpdate/ntpdate.c
cvs rdiff -r1.1.1.1 -r0 src/dist/ntp/scripts/genChangeLog
cvs rdiff -r1.2 -r1.3 src/dist/ntp/scripts/ntpsweep.in
cvs rdiff -r1.1.1.1 -r0 src/dist/ntp/sntp/libopts/m4/libtool.m4
cvs rdiff -r1.9 -r1.10 src/dist/ntp/util/ntp-keygen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.