- Added 1.1.3 changes to 1.1 branch

This commit is contained in:
Paul Bakker 2012-04-29 20:29:53 +00:00
parent 662d1686d9
commit a63c9e9fba
5 changed files with 10 additions and 10 deletions

View file

@ -4,7 +4,7 @@
*/ */
/** /**
* @mainpage PolarSSL v1.1.2 source code documentation * @mainpage PolarSSL v1.1.3 source code documentation
* *
* This documentation describes the internal structure of PolarSSL. It was * This documentation describes the internal structure of PolarSSL. It was
* automatically generated from specially formatted comment blocks in * automatically generated from specially formatted comment blocks in

View file

@ -25,7 +25,7 @@ DOXYFILE_ENCODING = UTF-8
# The PROJECT_NAME tag is a single word (or a sequence of words surrounded # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
# by quotes) that should identify the project. # by quotes) that should identify the project.
PROJECT_NAME = "PolarSSL v1.1.2" PROJECT_NAME = "PolarSSL v1.1.3"
# The PROJECT_NUMBER tag can be used to enter a project or revision number. # The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or # This could be handy for archiving the generated documentation or

View file

@ -3,7 +3,7 @@
* *
* \brief Run-time version information * \brief Run-time version information
* *
* Copyright (C) 2006-2010, Brainspark B.V. * Copyright (C) 2006-2012, Brainspark B.V.
* *
* This file is part of PolarSSL (http://www.polarssl.org) * This file is part of PolarSSL (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org> * Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@ -39,16 +39,16 @@
*/ */
#define POLARSSL_VERSION_MAJOR 1 #define POLARSSL_VERSION_MAJOR 1
#define POLARSSL_VERSION_MINOR 1 #define POLARSSL_VERSION_MINOR 1
#define POLARSSL_VERSION_PATCH 2 #define POLARSSL_VERSION_PATCH 3
/** /**
* The single version number has the following structure: * The single version number has the following structure:
* MMNNPP00 * MMNNPP00
* Major version | Minor version | Patch version * Major version | Minor version | Patch version
*/ */
#define POLARSSL_VERSION_NUMBER 0x01010200 #define POLARSSL_VERSION_NUMBER 0x01010300
#define POLARSSL_VERSION_STRING "1.1.2" #define POLARSSL_VERSION_STRING "1.1.3"
#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.2" #define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.1.3"
#if defined(POLARSSL_VERSION_C) #if defined(POLARSSL_VERSION_C)

View file

@ -47,7 +47,7 @@ add_library(polarssl STATIC ${src})
else(NOT USE_SHARED_POLARSSL_LIBRARY) else(NOT USE_SHARED_POLARSSL_LIBRARY)
add_library(polarssl SHARED ${src}) add_library(polarssl SHARED ${src})
set_target_properties(polarssl PROPERTIES VERSION 1.1.1 SOVERSION 1) set_target_properties(polarssl PROPERTIES VERSION 1.1.3 SOVERSION 1)
endif(NOT USE_SHARED_POLARSSL_LIBRARY) endif(NOT USE_SHARED_POLARSSL_LIBRARY)

View file

@ -1,5 +1,5 @@
Check compiletime library version Check compiletime library version
check_compiletime_version:"1.1.2" check_compiletime_version:"1.1.3"
Check runtime library version Check runtime library version
check_runtime_version:"1.1.2" check_runtime_version:"1.1.3"