From: David Steele <david.steele@samsung.com>
Date: Fri, 15 Sep 2017 13:31:10 +0000 (+0000)
Subject: Merge "Revert "Revert TextVisual in TextLabel Patches"" into devel/master
X-Git-Tag: dali_1.2.58~5
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e736965a2c6ab2dd3dab41645c856e85387266cb;hp=5c827a7125b3c0420ba39766cbbcb0ee3eb8fccf

Merge "Revert "Revert TextVisual in TextLabel Patches"" into devel/master
---

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 8417ead..cc78eff 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 = 2;
-const unsigned int TOOLKIT_MICRO_VERSION = 56;
+const unsigned int TOOLKIT_MICRO_VERSION = 57;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index b46e4ff..e63ac50 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    1.2.56
+Version:    1.2.57
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT