Merge "DALi Version 1.2.11" into devel/master

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index c15604b..8c9ed00 100644 (file)
--- 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 = 10;
+const unsigned int TOOLKIT_MICRO_VERSION = 11;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index 0da6d86..b5a63b2 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:    1.2.10
+Version:    1.2.11
 Release:    1
 Group:      Development/Libraries
 License:    Apache License, Version 2.0

diff --git a/packaging/dali-csharp-wrapper.spec b/packaging/dali-csharp-wrapper.spec
index dca178a..788769d 100755 (executable)
--- a/packaging/dali-csharp-wrapper.spec
+++ b/packaging/dali-csharp-wrapper.spec
@@ -1,6 +1,6 @@
 Name:       NDalic
 Summary:    dali wrapper
-Version:    1.0.0
+Version:    1.2.11
 Release:    1
 Group:      uifw/graphic
 License:    TO_BE_FILLED_IN

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index f4e8ae0..bae76d7 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.2.10
+Version:    1.2.11
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-2-Clause and MIT