tree b89c5fbb3f5de5a3c31aee32a73ab4e194ca4627
parent 3bb0801a95dbebcf7f8248e7d7f1c33f7839f32d
parent a658a4051b03ad7d17b3c8d976af2d1caa5e8281
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1422008597 +0000
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> 1422008597 +0000

Merge branch 'development' into dtls

* development:
  Update copyright
  Fix issue in compat.sh
  Rename doxyfile
  Rename to mbed TLS in tests/
  Rename to mbed TLS in examples
  Remove old test certificates.
  Rename to mbed TLS in the documentation/comments
  Change name to mbed TLS in the copyright notice

Conflicts:
	doxygen/input/doc_mainpage.h
	doxygen/mbedtls.doxyfile
	include/polarssl/version.h
	tests/compat.sh