Gilles Peskine d91f2a26cb Merge branch 'development' into iotssl-1251-2.7 ... Conflict resolution: * ChangeLog: put the new entries in their rightful place. * library/x509write_crt.c: the change in development was whitespace only, so use the one from the iotssl-1251 feature branch.		2018-01-19 11:25:10 +01:00
..
mbedtls	Merge branch 'development' into iotssl-1251-2.7	2018-01-19 11:25:10 +01:00
.gitignore	Rename include directory to mbedtls	2015-03-10 11:23:56 +00:00
CMakeLists.txt	Fix whitespace in CMakeLists.txt	2015-06-25 10:59:57 +02:00