source-changes: CVS commit: src/crypto/dist/ipsec-tools/src/libipsec

Subject: CVS commit: src/crypto/dist/ipsec-tools/src/libipsec
To: None <source-changes@NetBSD.org>
From: Emmanuel Dreyfus <manu@netbsd.org>
List: source-changes
Date: 02/24/2005 20:59:24

Module Name:	src
Committed By:	manu
Date:		Thu Feb 24 20:59:24 UTC 2005

Modified Files:
	src/crypto/dist/ipsec-tools/src/libipsec: libpfkey.h

Log Message:
Resolve conflict


To generate a diff of this commit:
cvs rdiff -r1.2 -r1.3 src/crypto/dist/ipsec-tools/src/libipsec/libpfkey.h

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