projects / oweals / openssl.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a34a9df) | patch
Fix merge issue
authorMatt Caswell <matt@openssl.org>
Wed, 15 Feb 2017 09:44:46 +0000 (09:44 +0000)
committerMatt Caswell <matt@openssl.org>
Wed, 15 Feb 2017 10:50:39 +0000 (10:50 +0000)
commitbb90d02a71c60bc16389fba4ff06965714b1826f
tree776c21167dd7d530ab35cfeee06113228b79998etree | snapshot
parenta34a9df0712ac27256ec48e6f88c61064613ac08commit | diff
Fix merge issue

Causes make update to fail.

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