From: Paul Wisbey
Date: Fri, 20 Nov 2015 13:59:40 +0000 (-0800)
Subject: Merge "Check glyphs are laid out in text-view." into devel/master
X-Git-Tag: dali_1.1.12~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=cae356cdd8f0375a27a638fe88fbbcfa5b269bc7;hp=974d2c9d9bb99f7234eda29b97e2b1ca30733d05
Merge "Check glyphs are laid out in text-view." into devel/master
---
diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 6e6c267..7bbdf3e 100644
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -31,7 +31,7 @@ namespace Toolkit
const unsigned int TOOLKIT_MAJOR_VERSION = 1;
const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 10;
+const unsigned int TOOLKIT_MICRO_VERSION = 11;
const char * const TOOLKIT_BUILD_DATE = __DATE__ " " __TIME__;
#ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index e8bf15f..2822025 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
Name: dali-toolkit
Summary: The OpenGLES Canvas Core Library Toolkit
-Version: 1.1.10
+Version: 1.1.11
Release: 1
Group: System/Libraries
License: Apache-2.0, BSD-2.0, MIT