DALi Version 1.2.0

Change-Id: I6857fb7ae40b58280f7f64cf7a6b2d419b9e53cd

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 7ae7885770f735bb45cf3c2d3e7785653df70367..df243c8acc523ef4030d82c05f267470bc6f6d4c 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -30,8 +30,8 @@ namespace Toolkit
 {
 
 const unsigned int TOOLKIT_MAJOR_VERSION = 1;
-const unsigned int TOOLKIT_MINOR_VERSION = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 45;
+const unsigned int TOOLKIT_MINOR_VERSION = 2;
+const unsigned int TOOLKIT_MICRO_VERSION = 0;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index 22bfeaea1dfeb25877fe24f2c3c1bc563ff81062..02cf649805e20808d5a17a87c36b8b9a801d9169 100644 (file)
--- a/packaging/dali-addon.spec
+++ b/packaging/dali-addon.spec
@@ -1,6 +1,6 @@
 Name:       dali-addon
 Summary:    DALi module for Node.JS
-Version:    0.0.1
+Version:    1.2.0
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 3da38ddf830491a7eb7e8bc44b6d78c8d841e31b..f7897e2424bd7d1b5c3c4caafa97eb1dc87ac42a 100644 (file)
--- 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.45
+Version:    1.2.0
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT