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

[Emmanuel Dreyfus <manu%netbsd.org@localhost>]

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.