Merge "ImfManager - Typo fix SetRestoreAferFocusLost typo fixed -> SetRe... accepted/tizen/common/20141219.104151 submit/tizen_common/20141212.113839 submit/tizen_common/20141212.114052
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 11 Dec 2014 15:19:40 +0000 (07:19 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 11 Dec 2014 15:19:40 +0000 (07:19 -0800)
optional/dali-toolkit/public-api/dali-toolkit-version.cpp
packaging/dali-toolkit.spec

index 12efc07..7623c7e 100644 (file)
@@ -31,7 +31,7 @@ namespace Toolkit
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
 const unsigned int TOOLKIT_MINOR_VERSION = 0;
-const unsigned int TOOLKIT_MICRO_VERSION = 20;
+const unsigned int TOOLKIT_MICRO_VERSION = 21;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
index 137f9fd..5a9d722 100644 (file)
@@ -1,6 +1,6 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.0.20
+Version:    1.0.21
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0