From 8f387e6605bab601f406db4e0b2f2839362ce23a Mon Sep 17 00:00:00 2001
From: Paul Bakker <p.j.bakker@polarssl.org>
Date: Tue, 2 Oct 2012 15:26:45 +0000
Subject: [PATCH]  - Updated trunk base version to 1.2.0 for prerelease 1

---
 include/polarssl/version.h           | 12 ++++++------
 tests/suites/test_suite_version.data |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index 98eb0b3f1..159c95acb 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -3,7 +3,7 @@
  *
  * \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)
  *  Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
@@ -38,17 +38,17 @@
  * Major, Minor, Patchlevel
  */
 #define POLARSSL_VERSION_MAJOR  1
-#define POLARSSL_VERSION_MINOR  1
-#define POLARSSL_VERSION_PATCH  1
+#define POLARSSL_VERSION_MINOR  2
+#define POLARSSL_VERSION_PATCH  0
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define POLARSSL_VERSION_NUMBER         0x01010100
-#define POLARSSL_VERSION_STRING         "1.1.1"
-#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.1.1"
+#define POLARSSL_VERSION_NUMBER         0x01020000
+#define POLARSSL_VERSION_STRING         "1.2.0"
+#define POLARSSL_VERSION_STRING_FULL    "PolarSSL 1.2.0"
 
 #if defined(POLARSSL_VERSION_C)
 
diff --git a/tests/suites/test_suite_version.data b/tests/suites/test_suite_version.data
index 8809a5914..b6baca3b4 100644
--- a/tests/suites/test_suite_version.data
+++ b/tests/suites/test_suite_version.data
@@ -1,5 +1,5 @@
 Check compiletime library version
-check_compiletime_version:"1.1.1"
+check_compiletime_version:"1.2.0"
 
 Check runtime library version
-check_runtime_version:"1.1.1"
+check_runtime_version:"1.2.0"