projects / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 6140f03) | patch
Fix merge error
authorMatt Caswell <matt@openssl.org>
Tue, 8 Dec 2015 13:00:59 +0000 (13:00 +0000)
committerMatt Caswell <matt@openssl.org>
Tue, 8 Dec 2015 13:00:59 +0000 (13:00 +0000)
commit686cf15e9dfd3263ec05019f4b2b52253cdcf38e
tree594ec027771f5dc3dd0137da2c0550aea2ee6a3dtree | snapshot
parent6140f0365311e6d08cdde63932c56ee741d9a605commit | diff
Fix merge error

Commit 6140f0365 added some new ctrl constants. However due to a
merge error one of these values was duplicated with an existing
value.

Reviewed-by: Rich Salz <rsalz@openssl.org>
include/openssl/evp.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.