yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 01:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge glitch in ChangeLog

Browse source
This commit is contained in:
Gilles Peskine 2018-04-04 09:28:48 +02:00
parent f4e5b7e87d
commit e4d3b7f860
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -326,7 +326,6 @@ Changes
implementation. implementation.
* Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4 * Add explicit warnings for the use of MD2, MD4, MD5, SHA-1, DES and ARC4
throughout the library. throughout the library.
>>>>>>> development
= mbed TLS 2.6.0 branch released 2017-08-10 = mbed TLS 2.6.0 branch released 2017-08-10