Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-09-03 08:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix mistake in ChangeLog from file merge

Browse Source
This commit is contained in:
Simon Butcher
2017-03-02 12:06:53 +00:00
parent 8c6a2a37bb
commit 46c8073d7b
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
-1
View File
@@ -3,7 +3,6 @@ mbed TLS ChangeLog (Sorted per branch, date)
= mbed TLS x.x.x branch released xxxx-xx-xx
Bugfix
<<<<<<< HEAD
* Fix the redefinition of macro ssl_set_bio to an undefined symbol
mbedtls_ssl_set_bio_timeout in compat-1.3.h, by removing it.
Found by omlib-lin. #673