From 0edb6c14056bf38b02724cf03af0d657a2bd5a27 Mon Sep 17 00:00:00 2001
From: Gang Wei <gang.wei@intel.com>
Date: Fri, 4 Nov 2016 17:17:07 +0800
Subject: [PATCH] Change version number from 1.1.0-beta_1 to 1.1.0

---
 CHANGELOG    | 4 ++--
 configure.ac | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f9cf1419a..9b8d46659 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,4 @@
-Unreleased
+v1.1 - 2016-11-04
 Added
 * travis ci support.
 * Allow for unit tests to be enabled selectively.
@@ -41,6 +41,6 @@ Removed
 * Windows related code
 * depenedency on the TPM2.0-TSS repo source code
 
-2015-10-19 Gang Wei <gang.wei@intel.com>
+v1.0 - 2015-10-19
 * 1.0 release
 * 29 tools included
diff --git a/configure.ac b/configure.ac
index 7a2d3205f..35257f905 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([tpm2.0-tools], [1.1.0-beta_1])
+AC_INIT([tpm2.0-tools], [1.1.0])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_CC
 AC_PROG_CXX