- Merged changesets 1399 up to and including 1415 into 1.2 branch

This commit is contained in:
Paul Bakker 2012-11-14 12:39:52 +00:00
parent 97872aceb6
commit 9a73632fd9
33 changed files with 178 additions and 72 deletions

View file

@ -39,16 +39,16 @@
*/
#define POLARSSL_VERSION_MAJOR 1
#define POLARSSL_VERSION_MINOR 2
#define POLARSSL_VERSION_PATCH 0
#define POLARSSL_VERSION_PATCH 1
/**
* The single version number has the following structure:
* MMNNPP00
* Major version | Minor version | Patch version
*/
#define POLARSSL_VERSION_NUMBER 0x01020000
#define POLARSSL_VERSION_STRING "1.2.0"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.0"
#define POLARSSL_VERSION_NUMBER 0x01020100
#define POLARSSL_VERSION_STRING "1.2.1"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.2.1"
#if defined(POLARSSL_VERSION_C)