projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: 8608d23)
Merge "DALi Version 1.1.2" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 10 Sep 2015 10:21:26 +0000 (03:21 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 10 Sep 2015 10:21:26 +0000 (03:21 -0700)
dali-toolkit/public-api/dali-toolkit-version.cpp patch | blob | history
packaging/dali-toolkit.spec patch | blob | history

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index a0b3e1e..56709e4 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 = 1;
-const unsigned int TOOLKIT_MICRO_VERSION = 1;
+const unsigned int TOOLKIT_MICRO_VERSION = 2;
 const char * const TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index b670557..5ae4f93 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.1
+Version:    1.1.2
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0, BSD-2.0, MIT
Domain: Graphics System / DALi;