projects / oweals / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b153f09) | patch
Fix a merge error
authorMatt Caswell <matt@openssl.org>
Wed, 25 Jan 2017 15:17:42 +0000 (15:17 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 25 Jan 2017 15:30:27 +0000 (15:30 +0000)
commitb1531d8e6cc95837e38b10d875ae64144c6fdf7a
tree1e34b95af72b6458236e7ea99fbebb7cbfc5752ctree | snapshot
parentb153f0921bea38127de0b9440b0487db3004330dcommit | diff
Fix a merge error

Clashing function code values in evp.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2285)
include/openssl/evp.h diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.