Subject: CVS commit: src/crypto/dist/ipsec-tools
To: None <source-changes@NetBSD.org>
From: Emmanuel Dreyfus <manu@netbsd.org>
List: source-changes
Date: 02/23/2005 15:17:51 
Module Name:	src
Committed By:	manu
Date:		Wed Feb 23 15:17:51 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools/src/racoon: main.c
	src/crypto/dist/ipsec-tools/src/setkey: setkey.c
Removed Files:
	src/crypto/dist/ipsec-tools: Makefile.in aclocal.m4 config.guess
	    config.h.in config.sub configure depcomp install-sh ltmain.sh
	    missing ylwrap
	src/crypto/dist/ipsec-tools/autom4te.cache: output.0 output.1 requests
	    traces.0 traces.1
	src/crypto/dist/ipsec-tools/rpm: Makefile.in
	src/crypto/dist/ipsec-tools/rpm/suse: Makefile.in
	src/crypto/dist/ipsec-tools/src: Makefile.in
	src/crypto/dist/ipsec-tools/src/include-glibc: Makefile.in
	src/crypto/dist/ipsec-tools/src/libipsec: Makefile.in
	src/crypto/dist/ipsec-tools/src/racoon: Makefile.in
	src/crypto/dist/ipsec-tools/src/setkey: Makefile.in

Log Message:
Resolve conficts and remove autoconf files that were committed by mistake


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/Makefile.in \
    src/crypto/dist/ipsec-tools/aclocal.m4 \
    src/crypto/dist/ipsec-tools/config.guess \
    src/crypto/dist/ipsec-tools/config.h.in \
    src/crypto/dist/ipsec-tools/config.sub \
    src/crypto/dist/ipsec-tools/configure src/crypto/dist/ipsec-tools/depcomp \
    src/crypto/dist/ipsec-tools/install-sh \
    src/crypto/dist/ipsec-tools/ltmain.sh src/crypto/dist/ipsec-tools/missing \
    src/crypto/dist/ipsec-tools/ylwrap
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/autom4te.cache/output.0 \
    src/crypto/dist/ipsec-tools/autom4te.cache/output.1 \
    src/crypto/dist/ipsec-tools/autom4te.cache/requests \
    src/crypto/dist/ipsec-tools/autom4te.cache/traces.0 \
    src/crypto/dist/ipsec-tools/autom4te.cache/traces.1
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/rpm/Makefile.in
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/rpm/suse/Makefile.in
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/src/Makefile.in
cvs rdiff -r1.1.1.1 -r0 \
    src/crypto/dist/ipsec-tools/src/include-glibc/Makefile.in
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/src/libipsec/Makefile.in
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/src/racoon/Makefile.in
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/racoon/main.c
cvs rdiff -r1.1.1.1 -r0 src/crypto/dist/ipsec-tools/src/setkey/Makefile.in
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/setkey/setkey.c

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