]> CyberLeo.Net >> Repos - FreeBSD/FreeBSD.git/commit - crypto/openssl/doc/crypto/CMS_get0_SignerInfos.pod
projects / FreeBSD / FreeBSD.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fc3f42d c0936c9)
Fix a mismerge from head to projects/openssl111.
authorGlen Barber <gjb@FreeBSD.org>
Mon, 8 Oct 2018 19:39:05 +0000 (19:39 +0000)
committerGlen Barber <gjb@FreeBSD.org>
Mon, 8 Oct 2018 19:39:05 +0000 (19:39 +0000)
commit846803208a184badf765b187e1d164a6e2ff98de
treea2981728a9c879ed73f2944f517304ea9a62c6c6tree | snapshot
parentfc3f42d80f90f3c58aa11cf1f35092a9703bd77bcommit | diff
parentc0936c90d354220517462c07eefaa0c53411ddb8commit | diff
Fix a mismerge from head to projects/openssl111.

r339213 was cherry-picked back to head from the project branch, which
caused a conflict.  This commit properly records the mergeinfo from
head.

r339205 was missed, and r339214 is required for reintegration.

Sponsored by: The FreeBSD Foundation
Unnamed repository; edit this file 'description' to name the repository.