CVS commit: src/crypto/external/bsd/openssl.old

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Tue Apr 18 14:24:25 UTC 2023

Modified Files:
        src/crypto/external/bsd/openssl.old: mkpc
        src/crypto/external/bsd/openssl.old/dist/crypto: arm_arch.h

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssl.old/mkpc
cvs rdiff -u -r1.2 -r1.3 \
    src/crypto/external/bsd/openssl.old/dist/crypto/arm_arch.h

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