Matt Caswell b1531d8e6c 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)		2017-01-25 15:30:27 +00:00
..
internal	Clarify what RUN_ONCE returns	2017-01-13 13:10:21 +01:00
openssl	Fix a merge error	2017-01-25 15:30:27 +00:00