projects / oweals / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 73540f4) | patch
Fix a merge error
authorMatt Caswell <matt@openssl.org>
Fri, 17 Feb 2017 14:33:30 +0000 (14:33 +0000)
committerMatt Caswell <matt@openssl.org>
Fri, 17 Feb 2017 14:42:59 +0000 (14:42 +0000)
commit331c16d95f442a19a77ae087afdf26b67c8468f0
tree0a15b657ecc9c2b0ca7ef4a1d4a0376d2a4557b2tree | snapshot
parent73540f4729bb856ab066c6e7a57513a97e3ca36fcommit | diff
Fix a merge error

Fix an error code clash due to a merge

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