tree e8f7df7421f53f07476e7a51bd033e20ce689029
parent 5192e00a4d05c59b4e17ee92034252450b61921e
parent 0bbb38c67ebe48fb463f51ce44fe1f7bd79cbb9a
author Gilles Peskine <Gilles.Peskine@arm.com> 1618822319 +0200
committer Gilles Peskine <Gilles.Peskine@arm.com> 1618822319 +0200

Merge branch 'development' into development_3.0

Conflicts:
* visualc/VS2010/mbedTLS.vcxproj: resolved by re-generating the file
  with scripts/generate_visualc_files.pl.